From 1ff9f685f699812b2cbdd688f829050b09054363 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 15 Jul 2004 09:41:37 +0000
Subject: [PATCH] Removed dependency on non-public goal <code>war:init</code>
 and computed the name of the WAR file by using the
 <code>maven.war.final.name</code> property from the WAR plugin.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115828 13f79535-47bb-0310-9956-ffa450edef68
---
 j2ee/plugin.jelly      | 6 ++++--
 j2ee/xdocs/changes.xml | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/j2ee/plugin.jelly b/j2ee/plugin.jelly
index c1df6f99..e432fd9c 100644
--- a/j2ee/plugin.jelly
+++ b/j2ee/plugin.jelly
@@ -36,7 +36,7 @@
   <!-- ================================================================ -->
   <!-- V A L I D A T E  A  W A R                                        -->
   <!-- ================================================================ -->
-  <goal name="j2ee:validate-war" prereqs="war:init"
+  <goal name="j2ee:validate-war"
     description="Check that a war file is valid">
 
     <ant:taskdef name="warvalidator" classname="org.apache.maven.j2ee.WarValidator">
@@ -51,10 +51,12 @@
     </ant:taskdef>
     
     <maven:get var="warBuildDir" plugin="maven-war-plugin" property="maven.war.build.dir"/>
+    <maven:get var="warFinalName" plugin="maven-war-plugin" property="maven.war.final.name"/>
     
-    <ant:warvalidator warFileName="${warBuildDir}/${pom.artifactId}.war">
+    <ant:warvalidator warFileName="${warBuildDir}/${maven.war.final.name}">
       <ant:formatter type="plain" usefile="false"/>
     </ant:warvalidator>
+    
   </goal>
 
   <define:taglib uri="j2ee">
diff --git a/j2ee/xdocs/changes.xml b/j2ee/xdocs/changes.xml
index 71d2ae11..c795d60e 100644
--- a/j2ee/xdocs/changes.xml
+++ b/j2ee/xdocs/changes.xml
@@ -26,6 +26,11 @@
   </properties>
   <body>
     <release version="1.5.1-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="fix">
+        Removed dependency on non-public goal <code>war:init</code> and computed 
+        the name of the WAR file by using the <code>maven.war.final.name</code>
+        property from the WAR plugin.
+      </action>
       <action dev="dion" type="update">Remove pom.getPluginContext code and replace with maven:get</action>
     </release>
     <release version="1.5" date="2004-05-15">