You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2004/02/16 23:01:23 UTC
cvs commit: jakarta-cactus/integration/maven plugin.jelly
vmassol 2004/02/16 14:01:23
Modified: integration/maven/xdocs changes.xml
integration/maven plugin.jelly
Log:
<action dev="vmassol" type="fix">
Aligned the EAR-ing behavior in the Cactus plugin (when using the
<code>cactus:test-ear</code> goal) with the behavior from the EAR Maven
plugin. More specifically the Cactus plugin now honors both the
<code><ear.bundle></code> property tagging, the
<code>maven.ear.src</code> property and the
<code>maven.ear.manifest</code> property.
</action>
Revision Changes Path
1.23 +9 -1 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- changes.xml 12 Feb 2004 16:24:32 -0000 1.22
+++ changes.xml 16 Feb 2004 22:01:23 -0000 1.23
@@ -8,9 +8,17 @@
<body>
<release version="1.6dev" date="in CVS">
+ <action dev="vmassol" type="fix">
+ Aligned the EAR-ing behavior in the Cactus plugin (when using the
+ <code>cactus:test-ear</code> goal) with the behavior from the EAR Maven
+ plugin. More specifically the Cactus plugin now honors both the
+ <code><ear.bundle></code> property tagging, the
+ <code>maven.ear.src</code> property and the
+ <code>maven.ear.manifest</code> property.
+ </action>
<action dev="vmassol" type="fix" issue="26811" due-to="Archimedes Trajano" due-to-email="trajano@yahoo.com">
Added support for running tests packaged as an EAR when the Cactus
- plgin is triggered by defining the Cactus report in
+ plugin is triggered by defining the Cactus report in
<code>project.xml</code>.
</action>
<action dev="vmassol" type="fix">
1.21 +26 -24 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plugin.jelly 12 Feb 2004 16:24:32 -0000 1.20
+++ plugin.jelly 16 Feb 2004 22:01:23 -0000 1.21
@@ -892,9 +892,24 @@
<ant:mkdir dir="${maven.build.dir}"/>
+ <!-- Ensure that the ear properties are loaded in memory so that they can be
+ referenced -->
+ <attainGoal name="ear:load"/>
+
+ <ant:available property="cactus.ear.manifest.available"
+ file="${pom.getPluginContext('maven-ear-plugin').getVariable('maven.ear.manifest')}"/>
+
+ <ant:available property="cactus.ear.src.available"
+ file="${pom.getPluginContext('maven-ear-plugin').getVariable('maven.ear.src')}"/>
+
<ant:ear destfile="${cactus.ear}"
appxml="${maven.build.dir}/application.xml">
+ <j:if test="${cactus.ear.src.available}">
+ <fileset dir="${pom.getPluginContext('maven-ear-plugin').getVariable('maven.ear.src')}"
+ casesensitive="false" excludes="**/META-INF/application.xml"/>
+ </j:if>
+
<!-- include cactus generated archives -->
<ant:fileset dir="${cactus.war.dir}">
<ant:include name="${cactus.war.name}"/>
@@ -905,31 +920,18 @@
<!-- include marked dependencies -->
<j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="dep" value="${lib.dependency}"/>
- <j:if test="${dep.getProperty('ejb.manifest.classpath')=='true'}">
-
- <j:set var="bundle" value="false"/>
- <j:if test="${dep.type == 'jar'}">
- <j:set var="bundle" value="true"/>
- </j:if>
- <j:if test="${dep.type == 'war'}">
- <j:set var="bundle" value="true"/>
- </j:if>
- <j:if test="${dep.type == 'ejb'}">
- <j:set var="bundle" value="true"/>
- </j:if>
- <j:if test="${dep.type == 'rar'}">
- <j:set var="bundle" value="true"/>
- </j:if>
-
- <j:if test="${bundle}">
- <ant:fileset dir="${lib.file.parent}">
- <ant:include name="${lib.file.name}"/>
- </ant:fileset>
- </j:if>
-
- </j:if>
+ <j:set var="dep" value="${lib.dependency}"/>
+ <j:if test="${dep.getProperty('ear.bundle')=='true'}">
+ <ant:fileset dir="${lib.file.parent}">
+ <ant:include name="${lib.file.name}"/>
+ </ant:fileset>
+ </j:if>
</j:forEach>
+
+ <j:if test="${cactus.ear.manifest.available}">
+ <ant:setProperty name="manifest"
+ value="${pom.getPluginContext('maven-ear-plugin').getVariable('maven.ear.manifest')}"/>
+ </j:if>
</ant:ear>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org