Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/ear/plugin.jelly,v
retrieving revision 1.15
diff -u -r1.15 plugin.jelly
--- plugin.jelly	19 Oct 2003 23:35:33 -0000	1.15
+++ plugin.jelly	18 Feb 2004 03:37:27 -0000
@@ -51,7 +51,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'}">
           
           <!-- 
            We know that this dep "wants" to be bundled.
@@ -125,7 +125,7 @@
         <x:element name="display-name">${maven.ear.displayname}</x:element>
         <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'}">
             <j:choose>
               <j:when test="${dep.type=='war'}">
                 <x:element name="module">
@@ -141,9 +141,11 @@
                 </x:element>
               </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">