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/05/03 15:41:31 UTC
svn commit: r1478789 - in /incubator/jspwiki/trunk: ./ src/main/filters/
src/main/java/org/apache/wiki/ src/test/resources/ tests/etc/
Author: gmazza
Date: Fri May 3 13:41:31 2013
New Revision: 1478789
URL: http://svn.apache.org/r1478789
Log:
Moved some resource files from test/etc to src/test/resources
Added:
incubator/jspwiki/trunk/src/test/resources/filters.xml
- copied unchanged from r1478725, incubator/jspwiki/trunk/tests/etc/filters.xml
incubator/jspwiki/trunk/src/test/resources/jspwiki.properties
- copied unchanged from r1478725, incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl
incubator/jspwiki/trunk/src/test/resources/jspwiki_rcs.properties
- copied unchanged from r1478725, incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl
incubator/jspwiki/trunk/src/test/resources/jspwiki_vers.properties
- copied unchanged from r1478725, incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl
Removed:
incubator/jspwiki/trunk/tests/etc/filters.xml
incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl
incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl
incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.properties
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/pom.xml
incubator/jspwiki/trunk/src/main/filters/filters.properties
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1478789&r1=1478788&r2=1478789&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Fri May 3 13:41:31 2013
@@ -1,3 +1,11 @@
+2013-05-03 Glen Mazza (glenmazza AT apache DOT org)
+
+ * 2.9.1-incubating-8
+
+ * Moved test jspwiki{_vers, _rcs}.properties, filter.xml to Maven test/resources
+ location; activated Maven filtering for those files and updated build.xml and
+ pom.xml to point to new location for these files.
+
2013-05-02 Glen Mazza (glenmazza AT apache DOT org)
* Removed install.sh, build.sh/build.bat/build.properties.win, moved latter's
Modified: incubator/jspwiki/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=1478789&r1=1478788&r2=1478789&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Fri May 3 13:41:31 2013
@@ -34,7 +34,7 @@
@testcontainerlog@=tests/build/webtests/testcontainer.log
@tests.auth.filename=/tmp/testrepository/auth.txt
-@tests.filter@=tests/etc/filters.xml
+@tests.filter@=src/test/resources/filters.xml
#
# Windows may still require four "\" for every "\" in the path
@@ -48,7 +48,7 @@
#@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
+#@tests.filter@=filters.xml
# JavaMail configuration
@mail.smtp.host@=127.0.0.1
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1478789&r1=1478788&r2=1478789&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Fri May 3 13:41:31 2013
@@ -170,9 +170,9 @@
<fileset dir="${libs.tests}">
<include name="*.jar" />
</fileset>
- <!-- Standard Maven location for test resources; note ini folder
- present both below and in ${jarfile} (can cause conflict? bug?) -->
- <pathelement path="${tests.src}/../resources" />
+ <!-- Note ini folder present both below and
+ in ${jarfile} (can cause conflict? bug?) -->
+ <pathelement path="target/test-classes" />
<!-- Below line temporary until all test resources in Maven location -->
<pathelement path="${tests.resources}/etc" />
</path>
@@ -289,16 +289,16 @@
<target name="mkpropertyfile"
description="Builds the correct propertyfile from the build.properties">
<copy file="etc/jspwiki.properties.tmpl" tofile="etc/jspwiki.properties" />
- <copy file="tests/etc/jspwiki.properties.tmpl" tofile="tests/etc/jspwiki.properties" />
- <copy file="tests/etc/jspwiki_rcs.properties.tmpl" tofile="tests/etc/jspwiki_rcs.properties" />
- <copy file="tests/etc/jspwiki_vers.properties.tmpl" tofile="tests/etc/jspwiki_vers.properties" />
+ <copy file="src/test/resources/jspwiki.properties" tofile="target/test-classes/jspwiki.properties" />
+ <copy file="src/test/resources/jspwiki_rcs.properties" tofile="target/test-classes/jspwiki_rcs.properties" />
+ <copy file="src/test/resources/jspwiki_vers.properties" tofile="target/test-classes/jspwiki_vers.properties" />
<replace file="etc/jspwiki.properties"
replacefilterfile="${build.properties}" />
- <replace file="tests/etc/jspwiki.properties"
+ <replace file="target/test-classes/jspwiki.properties"
replacefilterfile="${build.properties}" />
- <replace file="tests/etc/jspwiki_rcs.properties"
+ <replace file="target/test-classes/jspwiki_rcs.properties"
replacefilterfile="${build.properties}" />
- <replace file="tests/etc/jspwiki_vers.properties"
+ <replace file="target/test-classes/jspwiki_vers.properties"
replacefilterfile="${build.properties}" />
</target>
@@ -317,9 +317,7 @@
<delete file="${code.i18n}/templates/default_en.properties" />
<delete file="tests/etc/groupdatabase.xml" />
<delete file="tests/etc/userdatabase.xml" />
- <delete file="tests/etc/jspwiki.properties" />
- <delete file="tests/etc/jspwiki_rcs.properties" />
- <delete file="tests/etc/jspwiki_vers.properties" />
+ <delete dir="target" />
<delete dir="tests/etc/db" />
<delete dir="tests/etc/WEB-INF" />
<delete file="tests/etc/groupdatabase.xml.old" />
@@ -834,6 +832,16 @@
</condition>
<antcall target="buildjar" />
+ <!-- Copy non-filtered test resources to target/test-classes folder -->
+ <copy todir="target/test-classes/ini">
+ <fileset dir="src/test/resources/ini"/>
+ </copy>
+ <copy todir="target/test-classes">
+ <fileset dir="src/test/resources">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+
<junit printsummary="yes" haltonfailure="no" fork="yes" failureproperty="test.failed">
<classpath>
<path refid="path.tests" />
@@ -843,7 +851,7 @@
<formatter type="xml" usefile="yes" />
<batchtest todir="${tests.reports}">
<fileset dir="${tests.src}">
- <include name="**/*Test.java" />
+ <exclude name="**/*Test.java" />
<exclude name="**/AllTest*java" />
<include name="**/StressTestSpeed.java" if="tests.stress.enabled"/>
<include name="**/StressTestVersioningProvider.java" if="tests.stress.enabled"/>
@@ -908,7 +916,7 @@
<mkdir dir="${webtests.build}" />
<!-- Create the master jspwiki.properties template for all webtests -->
- <copy file="tests/etc/jspwiki.properties"
+ <copy file="src/test/resources/jspwiki.properties"
toFile="${webtests.build}/jspwiki.properties.tmpl" flatten="true" />
<propertyfile file="${webtests.build}/jspwiki.properties.tmpl">
<entry key="jspwiki.authorizer" value="org.apache.wiki.auth.authorize.WebContainerAuthorizer" />
@@ -1283,7 +1291,7 @@ To automate the JAR signing processs, yo
<copy toDir="${tests.db.scripts}" overwrite="true">
<fileset dir="${db.scripts}" />
<filterset>
- <filtersfile file="tests/etc/jspwiki.properties" />
+ <filtersfile file="target/test-classes/jspwiki.properties" />
<filtersfile file="build.properties" />
</filterset>
</copy>
Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1478789&r1=1478788&r2=1478789&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Fri May 3 13:41:31 2013
@@ -212,6 +212,7 @@
<build>
<finalName>JSPWiki</finalName>
+ <!-- filtering: http://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html -->
<filters>
<filter>src/main/filters/filters.properties</filter>
</filters>
@@ -225,6 +226,7 @@
<testResources>
<testResource>
<directory>src/test/resources</directory>
+ <filtering>true</filtering>
</testResource>
<testResource>
<directory>tests/etc</directory>
@@ -274,6 +276,7 @@
<executions>
<execution>
<phase>generate-resources</phase>
+ <id>create_files</id>
<configuration>
<target>
<!-- Creating a specific _en file presently needed just so that "English" will appear as an option on
@@ -287,19 +290,10 @@
<copy file="tests/etc/userdatabase.xml.tmpl" toFile="tests/etc/userdatabase.xml"/>
<copy file="tests/etc/groupdatabase.xml.tmpl" toFile="tests/etc/groupdatabase.xml"/>
<copy file="etc/jspwiki.properties.tmpl" tofile="etc/jspwiki.properties" />
- <copy file="tests/etc/jspwiki.properties.tmpl" tofile="target/test-classes/jspwiki.properties" />
- <copy file="tests/etc/jspwiki_rcs.properties.tmpl" tofile="target/test-classes/jspwiki_rcs.properties" />
- <copy file="tests/etc/jspwiki_vers.properties.tmpl" tofile="target/test-classes/jspwiki_vers.properties" />
<!-- Filter the properties files -->
<replace file="etc/jspwiki.properties"
replacefilterfile="build.properties" />
- <replace file="target/test-classes/jspwiki.properties"
- replacefilterfile="build.properties" />
- <replace file="target/test-classes/jspwiki_rcs.properties"
- replacefilterfile="build.properties" />
- <replace file="target/test-classes/jspwiki_vers.properties"
- replacefilterfile="build.properties" />
<!-- Create web.xml files for testing -->
<copy file="src/main/webapp/WEB-INF/web.xml" tofile="target/test-classes/WEB-INF/web.xml" />
@@ -318,7 +312,17 @@
token="<!-- REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH" value="" />
<replace file="target/test-classes/WEB-INF/web.xml"
token="REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH -->" value="" />
-
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>process-test-resources</phase>
+ <id>compile</id>
+ <configuration>
+ <target>
<!-- Copy the database configuration information -->
<mkdir dir="tests/etc/db/hsql" />
<copy file="tests/etc/jdbc.properties.tmpl" tofile="tests/etc/db/jdbc.properties" />
Modified: incubator/jspwiki/trunk/src/main/filters/filters.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/filters/filters.properties?rev=1478789&r1=1478788&r2=1478789&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/main/filters/filters.properties (original)
+++ incubator/jspwiki/trunk/src/main/filters/filters.properties Fri May 3 13:41:31 2013
@@ -15,9 +15,10 @@
# specific language governing permissions and limitations
# under the License.
#
-# This file is for Maven use only, replaces the Ant
-# build.properties file which requires delimiters for filter
-# values (@appname@= instead of appname=, for example).
+# Below properties for Maven filtering only, replacing the
+# build.properties kept in the JSPWiki home folder. With
+# Maven filtering property names do not carry the @ @
+# delimiters that Ant requires.
#
appname=JSPWiki
logfile=/tmp/jspwiki.log
@@ -30,7 +31,7 @@ tests.logfile=/tmp/jspwikitests.log
testcontainerlog=tests/build/webtests/testcontainer.log
tests.auth.filename=/tmp/testrepository/auth.txt
-tests.filter=tests/etc/filters.xml
+tests.filter=/filters.xml
# JavaMail configuration
mail.smtp.host=127.0.0.1
@@ -38,3 +39,4 @@ mail.smtp.port=25
mail.from=JSPWiki <JS...@localhost>
#mail.smtp.account=foo
#mail.smtp.password=foopassword
+
Modified: incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java?rev=1478789&r1=1478788&r2=1478789&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java Fri May 3 13:41:31 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "7";
+ public static final String BUILD = "8";
/**
* This is the generic version string you should use