Author: ajaquith
Date: Wed Feb 4 05:18:27 2009
New Revision: 740610
URL: http://svn.apache.org/viewvc?rev=740610&view=rev
Log:
Fixed a few failing unit tests; tweaked build.xml so tests run again.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=740610&r1=740609&r2=740610&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Feb 4 05:18:27 2009
@@ -1,3 +1,9 @@
+2009-02-04 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 3.0.0-svn-61
+
+ * Fixed a few failing unit tests; tweaked build.xml so tests run again.
+
2009-01-30 Janne Jalkanen <[email protected]>
* 3.0.0-svn-60
Modified: incubator/jspwiki/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=740610&r1=740609&r2=740610&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Wed Feb 4 05:18:27 2009
@@ -301,7 +301,7 @@
<exec executable="apt">
<arg line="-classpath ${cp} -nocompile"/>
<arg line="-factory net.sourceforge.stripes.tools.SiteStructureTool"/>
- <arg line="-Astripes.output.file=${code.build}/sitemap.xml"/>
+ <arg line="-Astripes.output.file=build/sitemap.xml"/>
<arg line="${srcfiles}"/>
</exec>
<!-- Migrate the JSPs -->
@@ -309,7 +309,7 @@
<classpath>
<path refid="path.tests" />
</classpath>
- <arg value="src/webdocs" />
+ <arg value="src/WebContent" />
<arg value="build/migrated" />
<sysproperty key="stripes.migrator.migrateForms"
value="${stripes.migrator.migrateForms}" />
</java>
@@ -1236,15 +1236,15 @@
<target name="hsql-start" depends="hsql-check-start" unless="hsql.up"
description="Starts the Hypersonic database for testing.">
<echo message="Starting up Hypersonic JDBC server on localhost." />
- <delete file="${tests.src}/etc/db/hsql/jspwiki.lck"/>
+ <delete file="${tests}/etc/db/hsql/jspwiki.lck"/>
<java fork="yes" spawn="yes" classname="org.hsqldb.Server"
- dir="${tests.src}/etc/db/hsql">
+ dir="${tests}/etc/db/hsql">
<classpath>
<pathelement location="${jdbc.driver.jar}" />
</classpath>
</java>
<sleep seconds="5" />
- <available file="${tests.src}/etc/db/hsql/jspwiki.lck" property="hsql.up"/>
+ <available file="${tests}/etc/db/hsql/jspwiki.lck" property="hsql.up"/>
<fail unless="hsql.up">Hypersonic didn't appear to start up properly. You
can start it manually from the command line as follows:
cd tests/etc/db/hsql
java -cp ${jdbc.driver.jar} org.hsqldb.Server
@@ -1262,7 +1262,7 @@
SHUTDOWN
</sql>
<!-- The lock file should be deleted automatically, but just in case... -->
- <delete file="${tests.src}/etc/db/hsql/jspwiki.lck" />
+ <delete file="${tests}/etc/db/hsql/jspwiki.lck" />
<echo message="Done." />
</target>
