vmassol 2004/01/28 03:11:55
Modified: integration/maven/xdocs changes.xml
integration/maven plugin.jelly
Log:
<action dev="vmassol" type="fix">
When running Cactus tests on an EJB project, through
<code>cactus:test-ear</code>, do not include the EJB sources in
the cactified WAR inside the EAR we deploy.
</action>
Revision Changes Path
1.21 +5 -0 jakarta-cactus/integration/maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- changes.xml 25 Jan 2004 17:30:00 -0000 1.20
+++ changes.xml 28 Jan 2004 11:11:50 -0000 1.21
@@ -8,6 +8,11 @@
<body>
<release version="1.6dev" date="in CVS">
+ <action dev="vmassol" type="fix">
+ When running Cactus tests on an EJB project, through
+ <code>cactus:test-ear</code>, do not include the EJB sources in
+ the cactified WAR inside the EAR we deploy.
+ </action>
<action dev="vmassol" type="add">
Added new <code>cactus.jboss3x.jndiport</code> property to specify
which JNDI port to use when shutting down JBoss. Defaults to 1099
1.19 +19 -2 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plugin.jelly 25 Jan 2004 17:30:00 -0000 1.18
+++ plugin.jelly 28 Jan 2004 11:11:53 -0000 1.19
@@ -231,7 +231,15 @@
<!-- Generate the war artifact -->
<attainGoal name="${cactus.build.goal.war}"/>
- <cactifywar srcfile="${cactus.src.war}" destfile="${cactus.war}">
+ <cactifywar version="2.3" destfile="${cactus.war}">
+
+ <!-- Only specify a source war to cactify if we are not testing EJBs.
+ The reason is to prevent adding EJB sources to the cactified war,
+ which can lead to problems on some containers as the EJB classes
+ will be present both in the cactified war and in the ejb-jar. -->
+ <j:if test="${!isEjbProject}">
+ <ant:setProperty name="srcfile" value="${cactus.src.war}"/>
+ </j:if>
<!-- Add the mergewebxml attribute if it has been defined by the
user -->
@@ -849,11 +857,20 @@
<!--
========================================================================
+ Initialization before cactifying the EAR
+ ========================================================================
+ -->
+ <goal name="cactus:cactifyear-init">
+ <j:set var="isEjbProject" value="true"/>
+ </goal>
+
+ <!--
+ ========================================================================
Generate a Cactified EAR
========================================================================
-->
<goal name="cactus:cactifyear"
- prereqs="cactus:cactifywar,cactus:generate-ear-descriptor"
+
prereqs="cactus:cactifyear-init,cactus:cactifywar,cactus:generate-ear-descriptor"
description="Create and cactify an EAR">
<!-- Generate the ejb artifact -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
