dion 2003/08/12 23:57:11
Modified: src/plugins-build/cactus/xdocs Tag: MAVEN_RC1_STABLE
properties.xml changes.xml
src/plugins-build/cactus Tag: MAVEN_RC1_STABLE plugin.jelly
project.xml plugin.properties
Log:
Pick up recent HEAD cactus changes
Revision Changes Path
No revision
No revision
1.10.4.1 +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.10.4.1
diff -u -r1.10 -r1.10.4.1
--- properties.xml 7 Jul 2003 19:44:27 -0000 1.10
+++ properties.xml 13 Aug 2003 06:57:11 -0000 1.10.4.1
@@ -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.16.4.2 +12 -2 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.16.4.1
retrieving revision 1.16.4.2
diff -u -r1.16.4.1 -r1.16.4.2
--- changes.xml 7 Aug 2003 16:58:48 -0000 1.16.4.1
+++ changes.xml 13 Aug 2003 06:57:11 -0000 1.16.4.2
@@ -8,13 +8,23 @@
<body>
<release version="3.1" date="in CVS">
+ <action dev="vmassol" type="update">
+ Updated commons-httpclient dependency to 2.0 rc1 and httpunit to
+ 1.5.3.
+ </action>
+ <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).
- Not tested yet (I don't have WL7 on my machine)!
</action>
<action dev="vmassol" type="update">
- Update to Cactus 1.5-beta1.
+ Updated to Cactus 1.6dev-20030809 which has fixes for WebLogic 7.x
+ support.
</action>
</release>
No revision
No revision
1.29.4.2 +29 -10 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.4.1
retrieving revision 1.29.4.2
diff -u -r1.29.4.1 -r1.29.4.2
--- plugin.jelly 7 Aug 2003 16:58:49 -0000 1.29.4.1
+++ plugin.jelly 13 Aug 2003 06:57:11 -0000 1.29.4.2
@@ -43,8 +43,8 @@
<pathelement location="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
<pathelement location="${plugin.getDependencyPath('httpunit:httpunit')}"/>
<pathelement location="${plugin.getDependencyPath('nekohtml:nekohtml')}"/>
- <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement location="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
+ <pathelement location="${plugin.getDependencyPath('xerces:xerces')}"/>
+ <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
<pathelement location="${plugin.getDependencyPath('rhino:js')}"/>
</ant:path>
@@ -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,8 +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"
- beaHome="${cactus.home.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}"/>
@@ -461,8 +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"
- beaHome="${cactus.home.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}"/>
@@ -478,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"
@@ -567,8 +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"
- beaHome="${cactus.home.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}"/>
1.31.4.3 +7 -6 maven/src/plugins-build/cactus/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/project.xml,v
retrieving revision 1.31.4.2
retrieving revision 1.31.4.3
diff -u -r1.31.4.2 -r1.31.4.3
--- project.xml 11 Aug 2003 04:16:33 -0000 1.31.4.2
+++ project.xml 13 Aug 2003 06:57:11 -0000 1.31.4.3
@@ -74,17 +74,17 @@
<dependency>
<groupId>cactus</groupId>
<artifactId>cactus</artifactId>
- <version>13-1.5-beta1</version>
+ <version>13-1.6dev-20030809</version>
</dependency>
<dependency>
<groupId>cactus</groupId>
<artifactId>cactus-ant</artifactId>
- <version>13-1.5-beta1</version>
+ <version>13-1.6dev-20030809</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>2.0-alpha3</version>
+ <version>2.0-rc1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -102,17 +102,18 @@
<version>3.8.1</version>
</dependency>
- <!-- Note: Dependencies below are needed by HttpUnit -->
+ <!-- Note: Dependencies below are needed by HttpUnit. Xerces is also
+ needed by the XML report used by the junitreport Ant task -->
<dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
- <version>1.5.1</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>0.7.7</version>
+ <version>0.7.4</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
1.11.4.1 +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.11.4.1
diff -u -r1.11 -r1.11.4.1
--- plugin.properties 7 Jul 2003 19:44:27 -0000 1.11
+++ plugin.properties 13 Aug 2003 06:57:11 -0000 1.11.4.1
@@ -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 =
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
