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}.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113164 13f79535-47bb-0310-9956-ffa450edef68

war/plugin.jelly

@@ -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>

war/plugin.properties

@@ -12,6 +12,9 @@ maven.war.webxml=${maven.war.src}/WEB-INF/web.xml
 # 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}

war/xdocs/properties.xml

@@ -50,10 +50,18 @@
           <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>
     </section>
     <section name="Including Jars in the Webapp">