smor 2003/03/20 17:26:29
Modified: src/plugins-build/war plugin.jelly plugin.properties
src/plugins-build/war/xdocs properties.xml
Log:
o Added a property to specify the directory of the webapp dir.
o Documented the new property in properties.xml
In some cases it might be different from the war dir, so this allows one to
change it in its project.properties file.
It defaults to ${maven.war.build.dir}/${pom.artifactId}.
Revision Changes Path
1.7 +3 -4 maven/src/plugins-build/war/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 17 Feb 2003 17:31:35 -0000 1.6
+++ plugin.jelly 21 Mar 2003 01:26:29 -0000 1.7
@@ -95,10 +95,9 @@
<echo>Assembling webapp ${pom.artifactId}</echo>
- <property name="webapp.build" value="${maven.war.build.dir}/${pom.artifactId}"/>
- <mkdir dir="${webapp.build}"/>
+ <mkdir dir="${maven.war.webapp.dir}"/>
- <property name="webapp.build.webinf" value="${webapp.build}/WEB-INF"/>
+ <property name="webapp.build.webinf" value="${maven.war.webapp.dir}/WEB-INF"/>
<mkdir dir="${webapp.build.webinf}"/>
<property name="webapp.build.lib" value="${webapp.build.webinf}/lib"/>
@@ -108,7 +107,7 @@
<mkdir dir="${webapp.build.classes}"/>
<j:if test="${webSourcesPresent == 'true'}">
- <copy todir="${webapp.build}">
+ <copy todir="${maven.war.webapp.dir}">
<fileset dir="${maven.war.src}"/>
</copy>
</j:if>
1.2 +4 -1 maven/src/plugins-build/war/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 24 Jan 2003 03:46:23 -0000 1.1
+++ plugin.properties 21 Mar 2003 01:26:29 -0000 1.2
@@ -12,6 +12,9 @@
# Note: Classes are relative to build.dir
maven.war.classes.includes=**
maven.war.classes.excludes=**/package.html
-# Location where the webapp or the war will be created. Defaults to
+# Location where the war will be created. Defaults to
# ${maven.build.dir}
maven.war.build.dir = ${maven.build.dir}
+# Location where the webapp will be created. Defaults to
+# ${maven.war.build.dir}/${pom.artifactId}
+maven.war.webapp.dir = ${maven.war.build.dir}/${pom.artifactId}
1.2 +9 -1 maven/src/plugins-build/war/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/properties.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- properties.xml 24 Jan 2003 03:46:24 -0000 1.1
+++ properties.xml 21 Mar 2003 01:26:29 -0000 1.2
@@ -50,8 +50,16 @@
<td>maven.war.build.dir</td>
<td>Yes</td>
<td>
- Directory where the webapp and war will be generated. It
defaults
+ Directory where the war will be generated. It defaults
to <code>${maven.build.dir}</code>.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.war.webapp.dir</td>
+ <td>Yes</td>
+ <td>
+ Directory where the webapp will be generated. It defaults to
+ <code>${maven.war.build.dir}/${pom.artifactId}</code>.
</td>
</tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
