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
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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')}"/>
|
||||
|
||||
Reference in New Issue
Block a user