From 0e87be29fc92d7e3260db2a0d93e8815a79e6069 Mon Sep 17 00:00:00 2001
From: evenisse <evenisse@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 16 Apr 2003 12:48:10 +0000
Subject: [PATCH] Use context.getVariable instead of context.findVariable when
 we want to obtain the text value in a tag attribute

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113350 13f79535-47bb-0310-9956-ffa450edef68
---
 jnlp/plugin.jelly | 6 +++---
 test/plugin.jelly | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jnlp/plugin.jelly b/jnlp/plugin.jelly
index 1a3ed2a5..25bfe6b6 100644
--- a/jnlp/plugin.jelly
+++ b/jnlp/plugin.jelly
@@ -96,7 +96,7 @@
 
                     <u:tokenize var="listOfProperties" delim=" ">${maven.jnlp.properties}</u:tokenize>
                     <j:forEach var="someProperty" items="${listOfProperties}">
-                      <property name="${someProperty}" value="${context.findVariable(someProperty)}"/>
+                      <property name="${someProperty}" value="${context.getVariable(someProperty)}"/>
                     </j:forEach>
                     
                 </resources>
@@ -105,7 +105,7 @@
                         <applet-desc main-class="${maven.jnlp.mainclass}" name="${maven.jnlp.applet.name}">
                             <u:tokenize var="listOfArguments" delim=" ">${maven.jnlp.mainclass.arguments}</u:tokenize>
                             <j:forEach var="someArgument" items="${listOfArguments}">
-                              <sysproperty key="${someArgument}" value="${context.findVariable(someArgument)}"/>
+                              <sysproperty key="${someArgument}" value="${context.getVariable(someArgument)}"/>
                             </j:forEach>
                         </applet-desc>
                     </j:when>
@@ -119,7 +119,7 @@
                         <application-desc main-class="${maven.jnlp.mainclass}">
                             <u:tokenize var="listOfArguments" delim=" ">${maven.jnlp.mainclass.arguments}</u:tokenize>
                             <j:forEach var="someArgument" items="${listOfArguments}">
-                              <sysproperty key="${someArgument}" value="${context.findVariable(someArgument)}"/>
+                              <sysproperty key="${someArgument}" value="${context.getVariable(someArgument)}"/>
                             </j:forEach>
                         </application-desc>
                     </j:otherwise>
diff --git a/test/plugin.jelly b/test/plugin.jelly
index 397cd8c2..15d5c829 100644
--- a/test/plugin.jelly
+++ b/test/plugin.jelly
@@ -74,7 +74,7 @@
         <sysproperty key="basedir" value="${basedir}"/>
         <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize>
         <j:forEach var="someProperty" items="${listOfProperties}">
-          <sysproperty key="${someProperty}" value="${context.findVariable(someProperty)}"/>
+          <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
         </j:forEach>
         <u:tokenize var="listOfJvmArgs" delim=" ">${maven.junit.jvmargs}</u:tokenize>
         <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
@@ -125,7 +125,7 @@
       <sysproperty key="basedir" value="${basedir}"/>
       <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize>
       <j:forEach var="someProperty" items="${listOfProperties}">
-        <sysproperty key="${someProperty}" value="${context.findVariable(someProperty)}"/>
+        <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
       </j:forEach>
       <u:tokenize var="listOfJvmArgs" delim=" ">${maven.junit.jvmargs}</u:tokenize>
       <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
@@ -173,7 +173,7 @@
             <sysproperty key="basedir" value="${basedir}"/>
             <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize>
             <j:forEach var="someProperty" items="${listOfProperties}">
-              <sysproperty key="${someProperty}" value="${context.findVariable(someProperty)}"/>
+              <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
             </j:forEach>
             <u:tokenize var="listOfJvmArgs" delim=" ">${maven.junit.jvmargs}</u:tokenize>
             <j:forEach var="somejvmarg" items="${listOfJvmArgs}">
@@ -235,7 +235,7 @@
             <sysproperty key="basedir" value="${basedir}"/>
             <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize>
             <j:forEach var="someProperty" items="${listOfProperties}">
-              <sysproperty key="${someProperty}" value="${context.findVariable(someProperty)}"/>
+              <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
             </j:forEach>
             <j:set var="jvmargs"
                value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.junit.jvmargs')}"/>