dion 2003/09/24 21:19:48
Modified: src/plugins-build/ear plugin.jelly
Log:
Fix for MAVEN-746.
Allows arbitrary bundling of files into an EAR.
Keeping a list of jar, war, ear, rar etc is getting ridiculous.
If the user puts ear.bundle to true, it goes in.
Revision Changes Path
1.14 +4 -31 maven/src/plugins-build/ear/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 25 Jul 2003 14:59:16 -0000 1.13
+++ plugin.jelly 25 Sep 2003 04:19:48 -0000 1.14
@@ -54,41 +54,14 @@
<j:if test="${dep.getProperty('ear.bundle')=='true'}">
<!--
-
We know that this dep "wants" to be bundled.
- We should bundle only jars, wars and ejbs
-
- -->
-
- <!-- I want to have
- <j:if test="${dep.type == 'jar' or dep.type == 'war' or dep.type ==
'ejb'} ">
- but jexl sucks so I have to write extra 10 lines...
-->
-
- <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:echo>Bundling: ${dep.type} - ${dep.id}</ant:echo>
- <ant:fileset dir="${lib.file.parent}">
- <ant:include name="${lib.file.name}"/>
- </ant:fileset>
+ <ant:echo>Bundling: ${dep.type} - ${dep.id}</ant:echo>
+ <ant:fileset dir="${lib.file.parent}">
+ <ant:include name="${lib.file.name}"/>
+ </ant:fileset>
- </j:if>
</j:if>
</j:forEach>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
