vmassol 2003/08/08 10:52:04
Modified: src/plugins-build/cactus/xdocs properties.xml changes.xml
src/plugins-build/cactus plugin.properties plugin.jelly
Log:
Added new optional property <code>cactus.weblogic7x.beahome</code> to
configure the location of BEA HOME for the WebLogic 7.x container. It
is only needed if the BEA HOME location is not the parent
directory of <code>cactus.home.weblogic7x</code>.
Revision Changes Path
1.11 +28 -8 maven/src/plugins-build/cactus/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/xdocs/properties.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- properties.xml 7 Jul 2003 19:44:27 -0000 1.10
+++ properties.xml 8 Aug 2003 17:52:04 -0000 1.11
@@ -302,15 +302,35 @@
</td>
</tr>
<tr>
- <td>cactus.tomcat5x.tmpdir</td>
- <td>Yes</td>
- <td>
- <p>
- Directory to which the container will be installed for the tests.
- By default the system temporary directory is used.
- </p>
- </td>
+ <td>cactus.tomcat5x.tmpdir</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Directory to which the container will be installed for the tests.
+ By default the system temporary directory is used.
+ </p>
+ </td>
</tr>
+ </table>
+ </section>
+
+ <section name="Cactus/WebLogic 7.x Settings">
+ <table>
+ <tr>
+ <th>Property</th>
+ <th>Optional?</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>cactus.weblogic7x.beahome</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Location of BEA HOME. If not specified it defaults to
+ the parent directory of <code>cactus.home.weblogic7x</code>.
+ </p>
+ </td>
+ </tr>
</table>
</section>
1.22 +6 -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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- changes.xml 7 Aug 2003 07:45:43 -0000 1.21
+++ changes.xml 8 Aug 2003 17:52:04 -0000 1.22
@@ -9,6 +9,12 @@
<release version="3.1" date="in CVS">
<action dev="vmassol" type="add">
+ Added new optional property <code>cactus.weblogic7x.beahome</code> to
+ configure the location of BEA HOME for the WebLogic 7.x container. It
+ is only needed if the BEA HOME location is not the parent
+ directory of <code>cactus.home.weblogic7x</code>.
+ </action>
+ <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).
</action>
1.12 +7 -1 maven/src/plugins-build/cactus/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/plugin.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.properties 7 Jul 2003 19:44:27 -0000 1.11
+++ plugin.properties 8 Aug 2003 17:52:04 -0000 1.12
@@ -87,4 +87,10 @@
# (optional). Tomcat 5.x directory to which the container will be installed for the
tests.
# By default the system temporary directory is used
-#cactus.tomcat5x.tmpdir =
\ No newline at end of file
+#cactus.tomcat5x.tmpdir =
+
+# (optional). Location of BEA HOME. If not specified it defaults to
+# the parent directory of cactus.home.weblogic7x
+#cactus.weblogic7x.beahome =
+
+
1.33 +27 -5 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- plugin.jelly 7 Aug 2003 07:45:43 -0000 1.32
+++ plugin.jelly 8 Aug 2003 17:52:04 -0000 1.33
@@ -65,6 +65,15 @@
<j:set var="cactusSourcePresent" value="true"/>
</util:available>
+ </goal>
+
+ <!--
+ ========================================================================
+ Preparations for executing the JUnit reports
+ ========================================================================
+ -->
+ <goal name="cactus:init-report">
+
<!-- Prepare the directories for the JUnit reports -->
<ant:mkdir dir="${cactus.reports.dir}"/>
@@ -218,7 +227,8 @@
defined.
========================================================================
-->
- <goal name="cactus:test" prereqs="cactus:init,cactus:cactifywar"
+ <goal name="cactus:test"
+ prereqs="cactus:init,cactus:init-report,cactus:cactifywar"
description="Run all Cactus Test Cases">
<cactus warfile="${maven.build.dir}/${pom.artifactId}-cactus.war"
@@ -295,7 +305,11 @@
<weblogic7x if="cactus.home.weblogic7x"
dir="${cactus.home.weblogic7x}" port="${cactus.port}"
output="${cactus.reports.dir}/weblogic7x.out"
- todir="${cactus.reports.dir}/weblogic7x"/>
+ todir="${cactus.reports.dir}/weblogic7x">
+ <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}">
+ <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/>
+ </j:if>
+ </weblogic7x>
</containerset>
<ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
@@ -460,7 +474,11 @@
<weblogic7x if="cactus.home.weblogic7x"
dir="${cactus.home.weblogic7x}" port="${cactus.port}"
output="${cactus.reports.dir}/weblogic7x.out"
- todir="${cactus.reports.dir}/weblogic7x"/>
+ todir="${cactus.reports.dir}/weblogic7x">
+ <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}">
+ <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/>
+ </j:if>
+ </weblogic7x>
</containerset>
<ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
@@ -476,7 +494,7 @@
========================================================================
Execute a Cactus tests on all containers which have been defined,
i.e. which have a ${cactus.home.[container name]} property
- defined. Specify the matching tests with -Dmatch=FooTest
+ defined. Specify the matching tests with -Dtestmatch=FooTest
========================================================================
-->
<goal name="cactus:match" prereqs="cactus:init,cactus:cactifywar"
@@ -565,7 +583,11 @@
<weblogic7x if="cactus.home.weblogic7x"
dir="${cactus.home.weblogic7x}" port="${cactus.port}"
output="${cactus.reports.dir}/weblogic7x.out"
- todir="${cactus.reports.dir}/weblogic7x"/>
+ todir="${cactus.reports.dir}/weblogic7x">
+ <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}">
+ <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/>
+ </j:if>
+ </weblogic7x>
</containerset>
<ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
