[Maven-plugins-cvs] cvs commit: maven-plugins/webtest plugin.jelly

[Siegfried G. <wd...@us...>]

wdsgoe      05/03/09 03:10:28

  Modified:    webtest  plugin.jelly
  Log:
  Hopefully fixed broken ANT parameter handling under UNIX
  
  Revision  Changes    Path
  1.13      +13 -1     maven-plugins/webtest/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/plugin.jelly,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- plugin.jelly	2 Mar 2005 16:49:29 -0000	1.12
  +++ plugin.jelly	9 Mar 2005 11:10:27 -0000	1.13
  @@ -86,6 +86,7 @@
         maven.webtest.config.haltonerror          = ${maven.webtest.config.haltonerror}
         maven.webtest.config.autorefresh          = ${maven.webtest.config.autorefresh}
       </echo>
  +    
     </goal>
   
     <!-- ================================================================== -->
  @@ -130,6 +131,15 @@
       -->
   
       <j:set var="hasAntTarget" value="${maven.webtest.target}X"/>
  +    <j:set var="hasAntOptions" value="${maven.webtest.ant.options}X"/>
  +
  +    <j:if test="${hasAntTarget != 'X'}">
  +      <echo>Using the following ANT target : ${maven.webtest.target}</echo>
  +    </j:if>
  +
  +    <j:if test="${hasAntOptions != 'X'}">
  +      <echo>Using the following ANT options : ${maven.webtest.ant.options}</echo>
  +    </j:if>
   
       <j:forEach var="testScriptFile" items="${testScripts.iterator()}">
         <!-- Start an ANT process for each webtest script -->
  @@ -158,7 +168,9 @@
           <j:forEach var="someProperty" items="${listOfProperties}">
             <sysproperty key="${someProperty}" value="${context.getVariable(someProperty)}"/>
           </j:forEach>
  -        <arg value="${maven.webtest.ant.options}"/>
  +        <j:if test="${hasAntOptions != 'X'}">        
  +          <arg value="${maven.webtest.ant.options}"/>
  +        </j:if>
           <arg value="-f"/>
           <arg value="${testScriptFile}"/>
           <j:if test="${hasAntTarget != 'X'}">