vmassol 2003/08/05 03:27:36
Modified: src/plugins-build/cactus/xdocs changes.xml
src/plugins-build/cactus plugin.jelly
Log:
Added back support for WL 7.x. I haven't tested it though. If someone who has WL7 on
his machine could test it, that would be great... :-)
Revision Changes Path
1.20 +5 -0 maven/src/plugins-build/cactus/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/xdocs/changes.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- changes.xml 5 Aug 2003 09:29:47 -0000 1.19
+++ changes.xml 5 Aug 2003 10:27:36 -0000 1.20
@@ -8,6 +8,11 @@
<body>
<release version="3.1" date="in CVS">
+ <action dev="vmassol" type="add">
+ Added back support for WebLogic 7.x (it had somehow been dropped
+ when we moved to the new Cactus/Ant integration in version 3.0).
+ Not tested yet (I don't have WL7 on my machine)!
+ </action>
<action dev="vmassol" type="update">
Update to Cactus 1.5-beta1.
</action>
1.30 +24 -1 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- plugin.jelly 10 Jul 2003 15:58:11 -0000 1.29
+++ plugin.jelly 5 Aug 2003 10:27:36 -0000 1.30
@@ -86,7 +86,9 @@
<j:if test="${context.getVariable('cactus.home.tomcat5x') != null}">
<ant:mkdir dir="${cactus.reports.dir}/tomcat5x"/>
</j:if>
-
+ <j:if test="${context.getVariable('cactus.home.weblogic7x') != null}">
+ <ant:mkdir dir="${cactus.reports.dir}/weblogic7x"/>
+ </j:if>
</goal>
@@ -290,6 +292,11 @@
</j:if>
</tomcat5x>
+ <weblogic7x if="cactus.home.weblogic7x"
+ dir="${cactus.home.weblogic7x}" port="${cactus.port}"
+ output="${cactus.reports.dir}/weblogic7x.out"
+ todir="${cactus.reports.dir}/weblogic7x"/>
+
</containerset>
<ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
<ant:formatter type="xml"/>
@@ -343,6 +350,12 @@
</ant:fileset>
</j:if>
+ <j:if test="${context.getVariable('cactus.home.weblogic7x') != null}">
+ <ant:fileset dir="${cactus.reports.dir}/weblogic7x">
+ <ant:include name="TEST-*.xml"/>
+ </ant:fileset>
+ </j:if>
+
</ant:junitreport>
<j:if test="${cactus.halt.on.failure}">
@@ -444,6 +457,11 @@
</j:if>
</tomcat5x>
+ <weblogic7x if="cactus.home.weblogic7x"
+ dir="${cactus.home.weblogic7x}" port="${cactus.port}"
+ output="${cactus.reports.dir}/weblogic7x.out"
+ todir="${cactus.reports.dir}/weblogic7x"/>
+
</containerset>
<ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
<ant:formatter type="xml"/>
@@ -543,6 +561,11 @@
excludes="${cactus.tomcat5x.conf.excludes}"/>
</j:if>
</tomcat5x>
+
+ <weblogic7x if="cactus.home.weblogic7x"
+ dir="${cactus.home.weblogic7x}" port="${cactus.port}"
+ output="${cactus.reports.dir}/weblogic7x.out"
+ todir="${cactus.reports.dir}/weblogic7x"/>
</containerset>
<ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
