From cd38399a8c279a7aae8bf7895bb332e28922268c Mon Sep 17 00:00:00 2001
From: kschrader <kschrader@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 27 Jan 2003 18:27:45 +0000
Subject: [PATCH] The webapp that is built shouldn't include the version number
 in the file/folder name.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112756 13f79535-47bb-0310-9956-ffa450edef68
---
 war/plugin.jelly | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/war/plugin.jelly b/war/plugin.jelly
index 2fbd98a4..5612f863 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -29,9 +29,9 @@
   <goal name="war:war" prereqs="war:init" description="Build a war file">
 
     <property name="maven.war.final.name" 
-      value="${maven.final.name}.war"/>
+      value="${pom.artifactId}.war"/>
   
-    <echo>Building WAR ${maven.final.name}</echo>
+    <echo>Building WAR ${pom.artifactId}</echo>
 
     <mkdir dir="${maven.war.build.dir}" />
     <war warfile="${maven.war.build.dir}/${maven.war.final.name}"
@@ -89,9 +89,9 @@
   <goal name="war:webapp" prereqs="war:init" 
     description="Build a webapp directory">
 
-    <echo>Assembling webapp ${maven.final.name}</echo>
+    <echo>Assembling webapp ${pom.artifactId}</echo>
 
-    <property name="webapp.build" value="${maven.war.build.dir}/${maven.final.name}"/>
+    <property name="webapp.build" value="${maven.war.build.dir}/${pom.artifactId}"/>
     <mkdir dir="${webapp.build}"/>
 
     <property name="webapp.build.webinf" value="${webapp.build}/WEB-INF"/>