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/03/02 21:31:55 UTC
cvs commit: jakarta-cactus/integration/maven plugin.jelly
vmassol 2004/03/02 12:31:55
Modified: integration/maven/xdocs changes.xml
integration/maven plugin.jelly
Log:
<action dev="vmassol" type="fix" issue="27351">
Aligning the EAR-ing behavior in the Cactus plugin for
Maven with the behavior from the EAR Maven plugin. More specifically,
supports the new <code><ear.module></code> property tagging +
fixes a bug in the generation of the EAR descriptor.
</action>
Revision Changes Path
1.28 +6 -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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- changes.xml 27 Feb 2004 14:08:59 -0000 1.27
+++ changes.xml 2 Mar 2004 20:31:55 -0000 1.28
@@ -8,6 +8,12 @@
<body>
<release version="1.6dev" date="in CVS">
+ <action dev="vmassol" type="fix" issue="27351">
+ Aligning the EAR-ing behavior in the Cactus plugin for
+ Maven with the behavior from the EAR Maven plugin. More specifically,
+ supports the new <code><ear.module></code> property tagging +
+ fixes a bug in the generation of the EAR descriptor.
+ </action>
<action dev="vmassol" type="fix" due-to="Nicolas Chalumeau" due-to-email="Nicolas.CHALUMEAU@arsoe-trelaze.com">
The <code>cactus:test-ear</code> goal was not properly using the
<code>cactus.test.includes</code>/<code>cactus.test.excludes</code> thus
1.23 +17 -10 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- plugin.jelly 27 Feb 2004 14:08:59 -0000 1.22
+++ plugin.jelly 2 Mar 2004 20:31:55 -0000 1.23
@@ -921,7 +921,7 @@
<!-- include marked dependencies -->
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
- <j:if test="${dep.getProperty('ear.bundle')=='true'}">
+ <j:if test="${dep.getProperty('ear.bundle')=='true' || dep.getProperty('ear.module')=='true'}">
<ant:fileset dir="${lib.file.parent}">
<ant:include name="${lib.file.name}"/>
</ant:fileset>
@@ -1205,33 +1205,40 @@
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
- <j:if test="${dep.getProperty('ejb.manifest.classpath')=='true'}">
+ <j:if test="${dep.getProperty('ear.bundle')=='true' || dep.getProperty('ear.module')=='true'}">
<j:choose>
<j:when test="${dep.type=='war'}">
<x:element name="module">
<x:element name="web">
<x:element name="web-uri">${dep.getArtifact()}</x:element>
<x:element name="context-root">${dep.getProperty('ear.appxml.war.context-root')}</x:element>
- </x:element>
+ </x:element>
</x:element>
</j:when>
<j:when test="${dep.type=='ejb'}">
<x:element name="module">
- <x:element name="ejb">${dep.getArtifact()}</x:element>
+ <x:element name="ejb">${dep.getArtifact()}</x:element>
</x:element>
- </j:when>
+ </j:when>
<j:when test="${dep.type=='jar'}">
- <x:element name="module">
- <x:element name="java">${dep.getArtifact()}</x:element>
- </x:element>
+ <j:if test="${dep.getProperty('ear.module')=='true'}">
+ <x:element name="module">
+ <x:element name="java">${dep.getArtifact()}</x:element>
+ </x:element>
+ </j:if>
</j:when>
<j:when test="${dep.type=='rar'}">
+ <x:element name="module">
+ <x:element name="connector">${dep.getArtifact()}</x:element>
+ </x:element>
+ </j:when>
+ <j:when test="${dep.type=='sar'}">
<x:element name="module">
<x:element name="connector">${dep.getArtifact()}</x:element>
</x:element>
</j:when>
- </j:choose>
- </j:if>
+ </j:choose>
+ </j:if>
</j:forEach>
</x:element>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org