You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/08/17 20:29:43 UTC
svn commit: r432323 - in /maven/maven-1/plugins/trunk/war: plugin.jelly
xdocs/changes.xml
Author: ltheussl
Date: Thu Aug 17 11:29:42 2006
New Revision: 432323
URL: http://svn.apache.org/viewvc?rev=432323&view=rev
Log:
PR: MPWAR-45
Submitted by: Kim Dykeman
war:inplace should check for maven.war.src.
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/viewvc/maven/maven-1/plugins/trunk/war/plugin.jelly?rev=432323&r1=432322&r2=432323&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/war/plugin.jelly Thu Aug 17 11:29:42 2006
@@ -312,9 +312,12 @@
<!-- In-place deployment of the web application -->
<!--==================================================================-->
<goal name="war:inplace"
+ prereqs="war:init"
description="Deploy a webapp into maven.war.src - in particular setting up WEB-INF/lib and WEB-INF/classes">
<j:set var="maven.war.webapp.dir" value="${maven.war.src}"/>
- <attainGoal name="war:webapp"/>
+ <j:if test="${webSourcesPresent == 'true'}">
+ <attainGoal name="war:webapp"/>
+ </j:if>
</goal>
<!--==================================================================-->
Modified: maven/maven-1/plugins/trunk/war/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/war/xdocs/changes.xml?rev=432323&r1=432322&r2=432323&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/war/xdocs/changes.xml Thu Aug 17 11:29:42 2006
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="1.6.3-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="fix" issue="MPWAR-45" due-to="Kim Dykeman">war:inplace should check for maven.war.src.</action>
<action dev="ltheussl" type="fix">
<description>Java sources are not compiled when used with maven-test-plugin-1.8 and maven.test.skip=true.</description>
<fixes issue="MPWAR-62"/>