cmlenz 2003/04/01 00:49:50
Modified: integration/ant/src/scripts/share build-share.xml
Log:
- User all-lowercase notation of the <webxmlmerge> attributes srcfile,
mergefile and destfile, as this seems more consistent with the
documentation and the core Ant tasks
- For DTDS, use the <dtd> nested element inside <xmlcatalog> instead
of <entity>
- Since <fail> supports an if/unless attribute, we do not need an extra
target just to check the property and fail if it has (not) been set
- Use the nested <sysproperty> element instead of <jvmarg> for
system properties
Revision Changes Path
1.15 +18 -21 jakarta-cactus/integration/ant/src/scripts/share/build-share.xml
Index: build-share.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/scripts/share/build-share.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build-share.xml 31 Mar 2003 21:06:59 -0000 1.14
+++ build-share.xml 1 Apr 2003 08:49:50 -0000 1.15
@@ -140,14 +140,14 @@
<!-- Perform a web.xml merge -->
<webxmlmerge
- srcFile="${cactus.target.dir}/${cactus.context}/WEB-INF/web.xml"
- mergeFile="${cactus.conf.dir}/web.xml"
- destFile="${cactus.target.dir}/${cactus.context}/WEB-INF/web.xml">
+ srcfile="${cactus.target.dir}/${cactus.context}/WEB-INF/web.xml"
+ mergefile="${cactus.conf.dir}/web.xml"
+ destfile="${cactus.target.dir}/${cactus.context}/WEB-INF/web.xml">
<xmlcatalog>
- <entity
+ <dtd
publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
location="${cactus.conf.dir}/web-app.dtd"/>
- <entity
+ <dtd
publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
location="${cactus.conf.dir}/web-app.dtd"/>
</xmlcatalog>
@@ -228,7 +228,8 @@
<istrue value="${cactus.halt.on.error}"/>
</and>
</condition>
- <antcall target="cactus.test.check.error"/>
+ <fail if="cactus.test.error.shouldstop"
+ message="There were test errors"/>
<condition property="cactus.test.failure.shouldstop">
<and>
@@ -236,19 +237,11 @@
<istrue value="${cactus.halt.on.failure}"/>
</and>
</condition>
- <antcall target="cactus.test.check.failure"/>
+ <fail if="cactus.test.failure.shouldstop"
+ message="There were test failures"/>
</target>
- <target name="cactus.test.check.error" if="cactus.test.error.shouldstop">
- <fail>There were test errors</fail>
- </target>
-
- <target name="cactus.test.check.failure"
- if="cactus.test.failure.shouldstop">
- <fail>There were test failures</fail>
- </target>
-
<!--
========================================================================
Run the Cactus tests using the JUnit text runner.
@@ -259,13 +252,15 @@
<junit printsummary="yes" failureproperty="cactus.junit.failure"
errorproperty="cactus.junit.error" fork="yes">
- <jvmarg
value="-Dcactus.contextURL=http://localhost:${cactus.port}/${cactus.context}"/>
+ <sysproperty key="cactus.contextURL"
+ value="http://localhost:${cactus.port}/${cactus.context}"/>
<!-- This is needed to override the default mapping which is
"/FilterRedirector". The reason is that in web.xml we have
mapped the filter redirector to "test/filterRedirector.jsp"
as some containers do not support mapping to a directory -->
- <jvmarg
value="-Dcactus.filterRedirectorName=test/filterRedirector.jsp"/>
+ <sysproperty key="cactus.filterRedirectorName"
+ value="test/filterRedirector.jsp"/>
<classpath>
<pathelement location="${cactus.target.conf.dir}"/>
@@ -309,13 +304,15 @@
<java classname="junit.swingui.TestRunner" fork="yes">
- <jvmarg
value="-Dcactus.contextURL=http://localhost:${cactus.port}/${cactus.context}"/>
+ <sysproperty key="cactus.contextURL"
+ value="http://localhost:${cactus.port}/${cactus.context}"/>
<!-- This is needed to override the default mapping which is
"/FilterRedirector". The reason is that in web.xml we have
mapped the filter redirector to "test/filterRedirector.jsp"
as some containers do not support mapping to a directory -->
- <jvmarg
value="-Dcactus.filterRedirectorName=test/filterRedirector.jsp"/>
+ <sysproperty key="cactus.filterRedirectorName"
+ value="test/filterRedirector.jsp"/>
<classpath>
<pathelement location="${cactus.target.conf.dir}"/>
@@ -351,4 +348,4 @@
<delete includeEmptyDirs="true">
<fileset dir="${cactus.target.dir}/${cactus.context}"/>
</delete>
- </target>
\ No newline at end of file
+ </target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
