vmassol 2003/06/07 08:42:20
Modified: src/plugins-build/cactus plugin.jelly
Log:
Make it work with Cactus tests using HttpUnit
Revision Changes Path
1.19 +25 -17 maven/src/plugins-build/cactus/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/plugin.jelly,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plugin.jelly 5 Jun 2003 05:35:33 -0000 1.18
+++ plugin.jelly 7 Jun 2003 15:42:20 -0000 1.19
@@ -30,12 +30,12 @@
<ant:path id="cactus.classpath">
<pathelement location="${plugin.getDependencyPath('cactus:cactus-ant')}"/>
<pathelement location="${plugin.getDependencyPath('cactus:cactus')}"/>
- <pathelement location="${plugin.getDependencyPath('commons-logging')}"/>
- <pathelement location="${plugin.getDependencyPath('junit')}"/>
- <pathelement location="${plugin.getDependencyPath('commons-httpclient')}"/>
+ <pathelement
location="${plugin.getDependencyPath('commons-logging:commons-logging')}"/>
+ <pathelement location="${plugin.getDependencyPath('junit:junit')}"/>
+ <pathelement
location="${plugin.getDependencyPath('commons-httpclient:commons-httpclient')}"/>
<pathelement location="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
- <pathelement location="${plugin.getDependencyPath('httpunit')}"/>
- <pathelement location="${plugin.getDependencyPath('nekohtml')}"/>
+ <pathelement location="${plugin.getDependencyPath('httpunit:httpunit')}"/>
+ <pathelement location="${plugin.getDependencyPath('nekohtml:nekohtml')}"/>
<pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<pathelement location="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
</ant:path>
@@ -137,18 +137,26 @@
<ant:classes dir="${cactus.target.classes.dir}"/>
- <!-- Orion fails on a servlet filter that is not mapped to an actual
- resource, to trick it -->
- <filterredirector mapping="/test/filterRedirector.jsp"/>
-
- <!-- Files needed for JBoss -->
- <ant:classes dir="${plugin.resources}/jboss3x">
- <ant:include name="*.properties" if="cactus.home.jboss3x"/>
- </ant:classes>
- <ant:webinf dir="${plugin.resources}/jboss3x">
- <ant:include name="jboss-web.xml" if="cactus.home.jboss3x"/>
- </ant:webinf>
-
+ <!-- Orion fails on a servlet filter that is not mapped to an actual
+ resource, to trick it -->
+ <filterredirector mapping="/test/filterRedirector.jsp"/>
+
+ <!-- Files needed for JBoss -->
+ <ant:classes dir="${plugin.resources}/jboss3x">
+ <ant:include name="*.properties" if="cactus.home.jboss3x"/>
+ </ant:classes>
+ <ant:webinf dir="${plugin.resources}/jboss3x">
+ <ant:include name="jboss-web.xml" if="cactus.home.jboss3x"/>
+ </ant:webinf>
+
+ <!-- Add all cactus related jars to the WEB-INF/lib dir. By default
+ the CactifyWarTask only adds the pure Cactus jars but not
+ related jars such as HttpUnit jars -->
+ <lib file="${plugin.getDependencyPath('httpunit:httpunit')}"/>
+ <lib file="${plugin.getDependencyPath('nekohtml:nekohtml')}"/>
+ <lib file="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+ <lib file="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
+
</cactifywar>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
