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

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

wdsgoe      04/10/28 01:51:03

  Modified:    webtest  plugin.jelly
  Log:
  Preparing release 0.9.1
  
  Revision  Changes    Path
  1.9       +28 -59    maven-plugins/webtest/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/plugin.jelly,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- plugin.jelly	12 Oct 2004 13:27:32 -0000	1.8
  +++ plugin.jelly	28 Oct 2004 08:51:03 -0000	1.9
  @@ -82,7 +82,6 @@
         maven.webtest.config.showhtmlparseroutput = ${maven.webtest.config.showhtmlparseroutput}
         maven.webtest.config.haltonfailure        = ${maven.webtest.config.haltonfailure}
         maven.webtest.config.haltonerror          = ${maven.webtest.config.haltonerror}
  -      maven.webtest.config.verbose              = ${maven.webtest.config.verbose}
         maven.webtest.config.autorefresh          = ${maven.webtest.config.autorefresh}
       </echo>
     </goal>
  @@ -93,8 +92,6 @@
   
     <goal name="webtest:test" description="Runs the Canoo webtest scripts">
   
  -    <j:set var="mavenRepoLocal" value='${context.getVariable("maven.repo.local")}'/>
  -
       <!-- Create the result path -->
       <mkdir dir="${maven.webtest.config.resultpath}"/>
   
  @@ -107,11 +104,9 @@
         </fileset>
       </fileScanner>
   
  -    <echo>Starting Canoo Webtest ...</echo>
  -
       <path id="webtest.classpath">
  -      <pathelement path="${plugin.getDependencyClasspath()}"/>
         <pathelement location="${plugin.dir}/plugin-resources/classes"/>
  +      <pathelement path="${plugin.getDependencyClasspath()}"/>
       </path>
   
       <!--
  @@ -123,63 +118,37 @@
       <j:set var="hasAntTarget" value="${maven.webtest.target}X"/>
   
       <j:forEach var="testScriptFile" items="${testScripts.iterator()}">
  -      <!-- echo>Processing ${testScriptFile.getName()}</echo -->
         <!-- Start an ANT process for each webtest script -->
  -      <j:if test="${hasAntTarget != 'X'}">
  -        <java classname="org.apache.tools.ant.Main" fork="yes" dir="${basedir}" failonerror="true">
  -          <classpath>
  -            <path refid="webtest.classpath"/>
  -          </classpath>
  -          <jvmarg value="-Xmx200m"/>
  -          <sysproperty key="host" value="${maven.webtest.config.host}"/>
  -          <sysproperty key="port" value="${maven.webtest.config.port}"/>
  -          <sysproperty key="protocol" value="${maven.webtest.config.protocol}"/>
  -          <sysproperty key="basepath" value="${maven.webtest.config.basepath}"/>
  -          <sysproperty key="summary" value="${maven.webtest.config.summary}"/>
  -          <sysproperty key="saveresponse" value="${maven.webtest.config.saveresponse}"/>
  -          <sysproperty key="resultpath" value="${maven.webtest.config.resultpath}"/>
  -          <sysproperty key="resultfile" value="${maven.webtest.config.resultfile}"/>
  -          <sysproperty key="haltonfailure" value="${maven.webtest.config.haltonfailure}"/>
  -          <sysproperty key="haltonerror" value="${maven.webtest.config.haltonerror}"/>
  -          <sysproperty key="showhtmlparseroutput" value="${maven.webtest.config.showhtmlparseroutput}"/>
  -          <sysproperty key="verbose" value="${maven.webtest.config.verbose}"/>
  -          <sysproperty key="autorefresh" value="${maven.webtest.config.autorefresh}"/>
  -          <sysproperty key="webtest.home" value="${maven.webtest.home}"/>
  -          <arg value="${maven.webtest.ant.options}"/>
  -          <arg value="-f"/>
  -          <arg value="${testScriptFile}"/>
  +      <java classname="org.apache.tools.ant.Main" fork="yes" dir="${basedir}" failonerror="true">
  +        <classpath>
  +          <fileset dir="${plugin.dir}/plugin-resources/lib">
  +            <include name="**/*.jar"/>
  +          </fileset>
  +          <path refid="webtest.classpath"/>
  +        </classpath>
  +        <jvmarg value="-Xmx200m"/>
  +        <sysproperty key="host" value="${maven.webtest.config.host}"/>
  +        <sysproperty key="port" value="${maven.webtest.config.port}"/>
  +        <sysproperty key="protocol" value="${maven.webtest.config.protocol}"/>
  +        <sysproperty key="basepath" value="${maven.webtest.config.basepath}"/>
  +        <sysproperty key="summary" value="${maven.webtest.config.summary}"/>
  +        <sysproperty key="saveresponse" value="${maven.webtest.config.saveresponse}"/>
  +        <sysproperty key="resultpath" value="${maven.webtest.config.resultpath}"/>
  +        <sysproperty key="resultfile" value="${maven.webtest.config.resultfile}"/>
  +        <sysproperty key="haltonfailure" value="${maven.webtest.config.haltonfailure}"/>
  +        <sysproperty key="haltonerror" value="${maven.webtest.config.haltonerror}"/>
  +        <sysproperty key="showhtmlparseroutput" value="${maven.webtest.config.showhtmlparseroutput}"/>
  +        <sysproperty key="autorefresh" value="${maven.webtest.config.autorefresh}"/>
  +        <sysproperty key="webtest.home" value="${maven.webtest.home}"/>
  +        <arg value="${maven.webtest.ant.options}"/>
  +        <arg value="-f"/>
  +        <arg value="${testScriptFile}"/>
  +        <j:if test="${hasAntTarget != 'X'}">
             <arg value="${maven.webtest.target}"/>
  -        </java>
  -      </j:if>
  -      <j:if test="${hasAntTarget == 'X'}">
  -        <java classname="org.apache.tools.ant.Main" fork="yes" dir="${basedir}" failonerror="true">
  -          <classpath>
  -            <path refid="webtest.classpath"/>
  -          </classpath>
  -          <jvmarg value="-Xmx200m"/>
  -          <sysproperty key="host" value="${maven.webtest.config.host}"/>
  -          <sysproperty key="port" value="${maven.webtest.config.port}"/>
  -          <sysproperty key="protocol" value="${maven.webtest.config.protocol}"/>
  -          <sysproperty key="basepath" value="${maven.webtest.config.basepath}"/>
  -          <sysproperty key="summary" value="${maven.webtest.config.summary}"/>
  -          <sysproperty key="saveresponse" value="${maven.webtest.config.saveresponse}"/>
  -          <sysproperty key="resultpath" value="${maven.webtest.config.resultpath}"/>
  -          <sysproperty key="resultfile" value="${maven.webtest.config.resultfile}"/>
  -          <sysproperty key="haltonfailure" value="${maven.webtest.config.haltonfailure}"/>
  -          <sysproperty key="haltonerror" value="${maven.webtest.config.haltonerror}"/>
  -          <sysproperty key="showhtmlparseroutput" value="${maven.webtest.config.showhtmlparseroutput}"/>
  -          <sysproperty key="verbose" value="${maven.webtest.config.verbose}"/>
  -          <sysproperty key="autorefresh" value="${maven.webtest.config.autorefresh}"/>
  -          <sysproperty key="webtest.home" value="${maven.webtest.home}"/>
  -          <arg value="${maven.webtest.ant.options}"/>
  -          <arg value="-f"/>
  -          <arg value="${testScriptFile}"/>
  -        </java>
  -      </j:if>
  +        </j:if>
  +      </java>
       </j:forEach>
   
  -    <echo>Finished running Canoo Webtest Plugin 0.9.1</echo>
  -
     </goal>
   
     <!-- ================================================================== -->