shuber 2005/01/04 16:59:58 CET
Modified files:
. plugin.jelly plugin.properties
xdocs properties.xml
Log:
Added new maven.jahiawar.forceuse setting to activate extra features of this
plugin even when calling the war:webapp, war:war goals directly.
Revision Changes Path
1.12 +10 -0 maven-jahiawar-plugin/plugin.jelly
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/maven-jahiawar-plugin/plugin.jelly.diff?r1=1.11&r2=1.12&f=h
1.5 +4 -0 maven-jahiawar-plugin/plugin.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/maven-jahiawar-plugin/plugin.properties.diff?r1=1.4&r2=1.5&f=h
1.5 +12 -0 maven-jahiawar-plugin/xdocs/properties.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/maven-jahiawar-plugin/xdocs/properties.xml.diff?r1=1.4&r2=1.5&f=h
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/repository/maven-jahiawar-plugin/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 11 Nov 2004 15:01:59 -0000 1.11
+++ plugin.jelly 4 Jan 2005 15:59:57 -0000 1.12
@@ -7,6 +7,11 @@
<postGoal name="war:webapp">
+ <j:set var="forceUse" value="${maven.jahiawar.forceuse}" />
+ <j:if test="${forceUse == 'true'}">
+ <j:set var="inJahiaWarPlugin" value="true" />
+ </j:if>
+
<j:if test="${inJahiaWarPlugin == 'true'}">
<j:set var="useSharedLibs" value="${maven.jahiawar.usesharedlibs}"/>
@@ -88,6 +93,11 @@
</goal>
<preGoal name="war:war">
+
+ <j:set var="forceUse" value="${maven.jahiawar.forceuse}" />
+ <j:if test="${forceUse == 'true'}">
+ <j:set var="inJahiaWarPlugin" value="true" />
+ </j:if>
<j:if test="${inJahiaWarPlugin == 'true'}">
Index: plugin.properties
===================================================================
RCS file: /home/cvs/repository/maven-jahiawar-plugin/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 5 Nov 2004 16:02:03 -0000 1.4
+++ plugin.properties 4 Jan 2005 15:59:57 -0000 1.5
@@ -1,4 +1,8 @@
+# Set this to true if you need to force usage of this plugin on the
war:webapp, war:war goals and not only when
+# called through the jahia:war goal
+maven.jahiawar.forceuse=false
+
# Settings for preGoal for packaging of WEB-INF/classes into a JAR in
WEB-INF/lib
# set to true if you want the contents of WEB-INF/classes to be packaged
into a JAR in WEB-INF/lib
maven.jahiawar.jarclasses=true
Index: properties.xml
===================================================================
RCS file: /home/cvs/repository/maven-jahiawar-plugin/xdocs/properties.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- properties.xml 5 Nov 2004 16:02:29 -0000 1.4
+++ properties.xml 4 Jan 2005 15:59:58 -0000 1.5
@@ -13,6 +13,18 @@
<th>Description</th>
</tr>
<tr>
+ <td>maven.jahiawar.forceuse</td>
+ <td>Yes</td>
+ <td>
+ <p>Default value is
+ <code>false</code>.</p>
+ <p>Set this to true if you need to force usage of this plugin on
the
+ war:webapp, war:war goals and not only when called through
the
+ jahia:war goal
+ </p>
+ </td>
+ </tr>
+ <tr>
<td>maven.jahiawar.deploy.war.dir</td>
<td>Yes</td>
<td>
