From b9ffdd28d4e8bfa15a65537c646e031f67062850 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 25 Sep 2003 04:19:48 +0000
Subject: [PATCH] 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.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114097 13f79535-47bb-0310-9956-ffa450edef68
---
 ear/plugin.jelly | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/ear/plugin.jelly b/ear/plugin.jelly
index 7e7e51d8..18703d96 100644
--- a/ear/plugin.jelly
+++ b/ear/plugin.jelly
@@ -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>