war:webapp will use ${maven.war.build.dir}/${pom.artifactId} as the root
directory of the webapp. For some reason I don't want the pom.artifactId
be used as part of webapp dir, I add a
properties "maven.war.build.noidsubdir" so the plugin will use
${maven.war.build.dir} as the webapp root dir
Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/war/plugin.jelly,v
retrieving revision 1.6
diff -r1.6 plugin.jelly
9c9
< <!--==================================================================-->
---
> <!--==================================================================-->
14c14
< <!--==================================================================-->
---
> <!--==================================================================-->
25c25
<
---
>
27c27
<
---
>
30c30
< <!--==================================================================-->
---
> <!--==================================================================-->
33c33
< <property name="maven.war.final.name"
---
> <property name="maven.war.final.name"
35c35
<
---
>
47c47
<
---
>
52,54c52,54
< </lib>
< </j:if>
< </j:forEach>
---
> </lib>
> </j:if>
> </j:forEach>
92,93c92,93
< <!--==================================================================-->
< <goal name="war:webapp" prereqs="war:init"
---
> <!--==================================================================-->
> <goal name="war:webapp" prereqs="war:init"
98c98,106
< <property name="webapp.build" value="${maven.war.build.dir}/${pom.artifactId}"/>
---
> <j:choose>
> <j:when
> test="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.noidsubdir')}">
> <property name="webapp.build" value="${maven.war.build.dir}"/>
> </j:when>
> <j:otherwise>
> <property name="webapp.build"
> value="${maven.war.build.dir}/${pom.artifactId}"/>
> </j:otherwise>
> </j:choose>
>
115c123
<
---
>
120,121c128,129
< </j:if>
< </j:forEach>
---
> </j:if>
> </j:forEach>
128c136
< </copy>
---
> </copy>
134c142
< <!--==================================================================-->
---
> <!--==================================================================-->
139c147
< <property name="maven.war.install.dir"
---
> <property name="maven.war.install.dir"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
