You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2006/11/28 17:50:04 UTC
svn commit: r480125 - in /maven/maven-1/plugins/trunk/eclipse:
src/plugin-resources/templates/wtpmodules.jelly xdocs/changes.xml
Author: aheritier
Date: Tue Nov 28 08:50:03 2006
New Revision: 480125
URL: http://svn.apache.org/viewvc?view=rev&rev=480125
Log:
WTP configuration : tld dependencies weren't deployed in ${maven.war.tld.dir} but in WEB-INF/lib
Modified:
maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/wtpmodules.jelly
maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/wtpmodules.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/wtpmodules.jelly?view=diff&rev=480125&r1=480124&r2=480125
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/wtpmodules.jelly (original)
+++ maven/maven-1/plugins/trunk/eclipse/src/plugin-resources/templates/wtpmodules.jelly Tue Nov 28 08:50:03 2006
@@ -109,7 +109,9 @@
<j:set var="relativePath"
value="${lib.dependency.groupId}/jars/${lib.dependency.artifactId}-${lib.dependency.version}.jar" />
</j:if>
- <dependent-module deploy-path="/WEB-INF/lib"
+ <j:if test="${lib.dependency.type == 'tld'}"><j:set var="outputDir" value="${maven.war.tld.dir}"/></j:if>
+ <j:if test="${lib.dependency.type != 'tld'}"><j:set var="outputDir" value="/WEB-INF/lib"/></j:if>
+ <dependent-module deploy-path="${outputDir}"
handle="module:/classpath/var/MAVEN_REPO/${relativePath}">
<dependency-type>uses</dependency-type>
</dependent-module>
Modified: maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml?view=diff&rev=480125&r1=480124&r2=480125
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml Tue Nov 28 08:50:03 2006
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="1.11.1-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="fix">WTP configuration : tld dependencies weren't deployed in ${maven.war.tld.dir} but in WEB-INF/lib</action>
<action dev="aheritier" type="add">New goal eclipse:multiclean</action>
<action dev="aheritier" type="add">New goal eclipse:multiproject</action>
<action dev="aheritier" type="update" issue="MAVEN-1769">Upgrade maven-model to version 3.0.2</action>