Author: aheritier
Date: Tue Sep 20 08:16:59 2005
New Revision: 290468
URL: http://svn.apache.org/viewcvs?rev=290468&view=rev
Log:
MPWAR-50 : Add support for EJB client code.
Modified:
maven/maven-1/plugins/trunk/war/plugin.jelly
maven/maven-1/plugins/trunk/war/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/war/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/war/plugin.jelly?rev=290468&r1=290467&r2=290468&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/war/plugin.jelly Tue Sep 20 08:16:59 2005
@@ -145,15 +145,14 @@
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.getProperty('war.bundle')=='true'}">
-
- <j:if test="${dep.type =='jar'}">
- <ant:copy todir="${webapp.build.lib}" file="${lib.path}"/>
- </j:if>
-
- <j:if test="${dep.type =='tld'}">
- <ant:copy todir="${webapp.build.tlds}" file="${lib.path}"/>
- </j:if>
-
+ <j:choose>
+ <j:when test="${dep.type =='jar' or dep.type =='ejb' or dep.type ==
'ejb-client'}">
+ <ant:copy todir="${webapp.build.lib}" file="${lib.path}"/>
+ </j:when>
+ <j:when test="${dep.type =='tld'}">
+ <ant:copy todir="${webapp.build.tlds}" file="${lib.path}"/>
+ </j:when>
+ </j:choose>
</j:if>
<!-- TO BE REMOVED -->
<j:if test="${dep.getProperty('war.bundle.jar')=='true'}">
Modified: maven/maven-1/plugins/trunk/war/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/war/xdocs/changes.xml?rev=290468&r1=290467&r2=290468&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/war/xdocs/changes.xml Tue Sep 20 08:16:59 2005
@@ -24,6 +24,9 @@
<author email="[EMAIL PROTECTED]">Vincent Massol</author>
</properties>
<body>
+ <release version="1.6.2-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MPWAR-50">Add support for
EJB client code.</action>
+ </release>
<release version="1.6.1" date="2004-10-23">
<action dev="felipeal" type="fix" issue="MPWAR-33">Removed attribute
<code>update=true</code>from
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
