From 6c4fbaa832b5b855ed775d49c31a90cf40ab8763 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 23 Sep 2003 14:56:56 +0000
Subject: [PATCH] Test versionless war is created Test dependent jar is copied
 to web-inf/lib

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114080 13f79535-47bb-0310-9956-ffa450edef68
---
 war/src/plugin-test/maven.xml   | 14 ++++++++++----
 war/src/plugin-test/project.xml |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/war/src/plugin-test/maven.xml b/war/src/plugin-test/maven.xml
index 97b7529c..ed2017fb 100644
--- a/war/src/plugin-test/maven.xml
+++ b/war/src/plugin-test/maven.xml
@@ -7,13 +7,19 @@
   <goal name="test-war">
     <attainGoal name="war"/>
 
-<!--    <j:set var="expectedFile" 
-      value="${maven.build.dir}/test-maven-ear-plugin-1.0-SNAPSHOT.ear"/>
-    <attainGoal name="ear"/>
+    <j:set var="expectedFile" 
+      value="${maven.build.dir}/test-maven-war-plugin.war"/>
     <u:file var="file" name="${expectedFile}" />
     <j:if test="${!(file.exists())}">
       <fail>${expectedFile} not generated</fail>
     </j:if>
--->
+
+    <j:set var="expectedFile" 
+      value="${maven.build.dir}/test-maven-war-plugin/WEB-INF/lib/commons-logging-1.0.3.jar"/>
+    <u:file var="file" name="${expectedFile}" />
+    <j:if test="${!(file.exists())}">
+      <fail>${expectedFile} not generated</fail>
+    </j:if>
+
   </goal>
 </project>
\ No newline at end of file
diff --git a/war/src/plugin-test/project.xml b/war/src/plugin-test/project.xml
index 485d5500..8be1f844 100644
--- a/war/src/plugin-test/project.xml
+++ b/war/src/plugin-test/project.xml
@@ -8,7 +8,7 @@
   <id>test-maven-war-plugin</id>
   
   <!-- a short but descriptive name for the project -->
-  <name>Test Maven War Plugin</name>
+  <name>Test project for Maven War Plugin</name>
   
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-dev -->