cmlenz 2003/03/17 06:28:05
Modified: integration/ant build.xml
Removed: integration/ant/src/java/org/apache/cactus/integration/ant
WebMerge.java WebMergeTask.java
integration/ant/src/test/org/apache/cactus/integration/ant
TestWebMerge.java
Log:
WebMergeTask has been replaced with WebXmlMergeTask
Revision Changes Path
1.6 +0 -4 jakarta-cactus/integration/ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 17 Mar 2003 13:27:46 -0000 1.5
+++ build.xml 17 Mar 2003 14:28:03 -0000 1.6
@@ -121,8 +121,6 @@
comment="Cactus Tasks for Ant">
<entry key="runservertests"
value="org.apache.cactus.integration.ant.RunServerTestsTask"/>
- <entry key="webmerge"
- value="org.apache.cactus.integration.ant.WebMergeTask"/>
<entry key="webxmlmerge"
value="org.apache.cactus.integration.ant.WebXmlMergeTask"/>
</propertyfile>
@@ -173,8 +171,6 @@
<fileset dir="${src.test.dir}">
<include name="**/Test*.java"/>
<exclude name="**/TestAll.java"/>
- <!-- Temporary exclude, the tests currently fail -->
- <exclude name="**/TestWebMerge.java"/>
</fileset>
</batchtest>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
