From fe74366ec13703dcb1da293784cdb5526da9a4a2 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 28 Jan 2003 03:26:26 +0000
Subject: [PATCH] Fix up usage of properties from other plugins

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112757 13f79535-47bb-0310-9956-ffa450edef68
---
 cactus/plugin.jelly      | 7 +++++--
 cactus/plugin.properties | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cactus/plugin.jelly b/cactus/plugin.jelly
index 1560d8a9..3de2c6bf 100644
--- a/cactus/plugin.jelly
+++ b/cactus/plugin.jelly
@@ -140,12 +140,15 @@
   <goal name="cactus:merge-webxml" prereqs="init-dvsl-tag"
     description="Generate a web.xml which is the merge betweem the user project web.xml and the webapp elements needed by Cactus">
 
-    <available file="${maven.war.webxml}"
+    <j:set var="warWebXml"
+      value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.webxml')}"/>
+
+    <available file="${warWebXml}"
         property="maven.cactus.webxml.exists"/>
 
     <j:choose>
       <j:when test="${maven.cactus.webxml.exists}">
-        <j:set var="webxml" value="${maven.war.webxml}"/>
+        <j:set var="webxml" value="${warWebXml}"/>
       </j:when>
       <j:otherwise>
         <j:set var="webxml" value="${maven.cactus.emptywebxml}"/>
diff --git a/cactus/plugin.properties b/cactus/plugin.properties
index eb93bdc6..b3bc5868 100644
--- a/cactus/plugin.properties
+++ b/cactus/plugin.properties
@@ -56,6 +56,11 @@ maven.cactus.test.reportsDirectory = ${maven.cactus.build.dir}/test-reports
 
 # Location where the project war/webapp is located (either as a war or an
 # expanded webapp). Cactus will then add its own stuff to the war/webapp.
+#
+# -- FIXME ---------------------------------------------
+# -- This style of property defaulting no longer works +
+# ------------------------------------------------------
+#
 maven.cactus.prewar.dir = ${maven.war.build.dir}
 
 # Define what TestRunner to use. Default is the JUnit text test runner