Menu
▾
▴
maven-plugins-cvs
|
From: Siegfried G. <wd...@us...> - 2002-12-27 15:26:58
|
wdsgoe 02/12/27 07:26:57
Modified: webtest plugin.jelly
Log:
Added maven.webtest.target and maven.webtest.ant.options
Revision Changes Path
1.2 +5 -1 maven-plugins/webtest/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 16 Dec 2002 11:34:03 -0000 1.1
+++ plugin.jelly 27 Dec 2002 15:26:57 -0000 1.2
@@ -10,17 +10,19 @@
<j:set var="testCaseName" value="${maven.webtest.file}"/>
<!-- if no webtest defined skip the processing -->
<j:if test="${!testCaseName.equals('noop')}">
- <echo>This product includes software developed by Canoo Engineering AG (http://www.canoo.com/)</echo>
<attainGoal name="webtest:clean"/>
+ <attainGoal name="webtest:info"/>
<attainGoal name="webtest:test"/>
<attainGoal name="webtest:generate-test-report"/>
<attainGoal name="webtest:generate-summary-report"/>
+ <attainGoal name="xdoc:transform"/>
</j:if>
</goal>
<goal name="webtest:info" description="Prints the configuration">
<echo>
maven.webtest.file = ${maven.webtest.file}
+ maven.webtest.target = ${maven.webtest.target}
maven.webtest.src = ${maven.webtest.src}
maven.webtest.config.host = ${maven.webtest.config.host}
maven.webtest.config.port = ${maven.webtest.config.port}
@@ -106,8 +108,10 @@
<sysproperty key="haltonfailure" value="${maven.webtest.config.haltonfailure}"/>
<sysproperty key="haltonerror" value="${maven.webtest.config.haltonerror}"/>
<sysproperty key="showhtmlparseroutput" value="${maven.webtest.config.showhtmlparseroutput}"/>
+ <arg value="${maven.webtest.ant.options}"/>
<arg value="-f"/>
<arg value="${testScriptFile}"/>
+ <arg value="${maven.webtest.target}"/>
</java>
</j:forEach>
|
|
From: Siegfried G. <wd...@us...> - 2003-07-31 18:34:52
|
wdsgoe 03/07/31 11:34:52
Modified: webtest plugin.jelly
Log:
Hopefully fixed the "empty target bug" for ANT under Unix
Revision Changes Path
1.6 +73 -38 maven-plugins/webtest/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 18 Jul 2003 09:30:01 -0000 1.5
+++ plugin.jelly 31 Jul 2003 18:34:52 -0000 1.6
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<project
- xmlns:ant="jelly:ant"
xmlns:j="jelly:core"
xmlns:util="jelly:util"
xmlns:doc="doc"
@@ -50,21 +49,23 @@
<goal name="webtest:info" description="Prints the configuration">
<echo>
- maven.webtest.file = ${maven.webtest.file}
- maven.webtest.target = ${maven.webtest.target}
- maven.webtest.src = ${maven.webtest.src}
- maven.webtest.config.host = ${maven.webtest.config.host}
- maven.webtest.config.port = ${maven.webtest.config.port}
- maven.webtest.config.protocol = ${maven.webtest.config.protocol}
- maven.webtest.config.basepath = ${maven.webtest.config.basepath}
- maven.webtest.config.summary = ${maven.webtest.config.summary}
- maven.webtest.config.verbose = ${maven.webtest.config.verbose}
- maven.webtest.config.saveresponse = ${maven.webtest.config.saveresponse}
- maven.webtest.config.resultpath = ${maven.webtest.config.resultpath}
- maven.webtest.config.resultfile = ${maven.webtest.config.resultfile}
- maven.webtest.jar.fileset.dir = ${maven.webtest.jar.fileset.dir}
- maven.webtest.jar.fileset.include = ${maven.webtest.jar.fileset.include}
- maven.webtest.jar.fileset.exclude = ${maven.webtest.jar.fileset.exclude}
+ maven.webtest.src = ${maven.webtest.src}
+ maven.webtest.file = ${maven.webtest.file}
+ maven.webtest.target = ${maven.webtest.target}
+ maven.webtest.src = ${maven.webtest.src}
+ maven.webtest.config.host = ${maven.webtest.config.host}
+ maven.webtest.config.port = ${maven.webtest.config.port}
+ maven.webtest.config.protocol = ${maven.webtest.config.protocol}
+ maven.webtest.config.basepath = ${maven.webtest.config.basepath}
+ maven.webtest.config.summary = ${maven.webtest.config.summary}
+ maven.webtest.config.verbose = ${maven.webtest.config.verbose}
+ maven.webtest.config.saveresponse = ${maven.webtest.config.saveresponse}
+ maven.webtest.config.resultpath = ${maven.webtest.config.resultpath}
+ maven.webtest.config.resultfile = ${maven.webtest.config.resultfile}
+ 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.ant.options = ${maven.webtest.ant.options}
</echo>
</goal>
@@ -92,30 +93,64 @@
<pathelement path="${plugin.getDependencyClasspath()}"/>
</path>
+ <!--
+ On UNIX we seem to have a problem with empty command
+ line parameters. Therefore we explicitely check for
+ them and start ANT accordingly
+ -->
+
+ <j:set var="hasAntOptions" value="${maven.webtest.ant.options}X"/>
+
<j:forEach var="testScriptFile" items="${testScripts.iterator()}">
- <echo>Processing ${testScriptFile.getName()}</echo>
+ <!-- echo>Processing ${testScriptFile.getName()}</echo -->
<!-- Start an ANT process for each webtest script -->
- <java classname="org.apache.tools.ant.Main" fork="yes" dir="${basedir}" failonerror="false">
- <classpath>
- <path refid="webtest.classpath"/>
- </classpath>
- <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="verbose" value="${maven.webtest.config.verbose}"/>
- <sysproperty key="saveresponse" value="${maven.webtest.config.saveresponse}"/>
- <sysproperty key="resultpath" file="${maven.webtest.config.resultpath}"/>
- <sysproperty key="resultfile" file="${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}"/>
- <arg value="${maven.webtest.ant.options}"/>
- <arg value="-f"/>
- <arg value="${testScriptFile}"/>
- <arg value="${maven.webtest.target}"/>
- </java>
+ <j:if test="${hasAntOptions != 'X'}">
+ <echo>We have ANT options ...</echo>
+ <java classname="org.apache.tools.ant.Main" fork="yes" dir="${basedir}" failonerror="false">
+ <classpath>
+ <path refid="webtest.classpath"/>
+ </classpath>
+ <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="verbose" value="${maven.webtest.config.verbose}"/>
+ <sysproperty key="saveresponse" value="${maven.webtest.config.saveresponse}"/>
+ <sysproperty key="resultpath" file="${maven.webtest.config.resultpath}"/>
+ <sysproperty key="resultfile" file="${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}"/>
+ <arg value="${maven.webtest.ant.options}"/>
+ <arg value="-f"/>
+ <arg value="${testScriptFile}"/>
+ <arg value="${maven.webtest.target}"/>
+ </java>
+ </j:if>
+ <j:if test="${hasAntOptions == 'X'}">
+ <!-- echo>We have no ANT options ...</echo -->
+ <java classname="org.apache.tools.ant.Main" fork="yes" dir="${basedir}" failonerror="false">
+ <classpath>
+ <path refid="webtest.classpath"/>
+ </classpath>
+ <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="verbose" value="${maven.webtest.config.verbose}"/>
+ <sysproperty key="saveresponse" value="${maven.webtest.config.saveresponse}"/>
+ <sysproperty key="resultpath" file="${maven.webtest.config.resultpath}"/>
+ <sysproperty key="resultfile" file="${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}"/>
+ <arg value="-f"/>
+ <arg value="${testScriptFile}"/>
+ <arg value="${maven.webtest.target}"/>
+ </java>
+ </j:if>
</j:forEach>
<echo>Finished running Canoo Webtest Plugin</echo>
|
|
From: Siegfried G. <wd...@us...> - 2004-10-28 08:51:10
|
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>
<!-- ================================================================== -->
|
|
From: Eric P. <de...@us...> - 2005-03-02 16:49:36
|
dep4b 05/03/02 08:49:30
Modified: webtest plugin.jelly
Log:
fix plugin name in registering plugin
Revision Changes Path
1.12 +10 -10 maven-plugins/webtest/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 19 Nov 2004 13:39:07 -0000 1.11
+++ plugin.jelly 2 Mar 2005 16:49:29 -0000 1.12
@@ -14,9 +14,9 @@
<goal name="maven-webtest-plugin:register">
<util:available file="${maven.webtest.src}">
<doc:registerReport name="Canoo WebTest Report"
- pluginName="webtest"
+ pluginName="maven-webtest-plugin"
description="Canoo WebTest Report."
- link="maven-webtest-report"/>
+ link="webtest-report"/>
</util:available>
</goal>
@@ -94,16 +94,16 @@
<goal name="webtest:test" description="Runs the Canoo webtest scripts">
- <!-- populate any missing system properties -->
- <util:tokenize var="listOfProperties" delim=" ">${maven.webtest.sysproperties}</util:tokenize>
+ <!-- populate any missing system properties -->
+ <util:tokenize var="listOfProperties" delim=" ">${maven.webtest.sysproperties}</util:tokenize>
<j:forEach var="someProperty" items="${listOfProperties}">
- <j:set var="somePropertyValue" value="${context.getVariable(someProperty)}"/>
+ <j:set var="somePropertyValue" value="${context.getVariable(someProperty)}"/>
- <j:if test="${empty(somePropertyValue)}">
- <i:ask question="What is the ${someProperty} to be used? (-D${someProperty}={value} to skip check)"
- answer="${someProperty}"/>
- </j:if>
- <maven:param-check value="${context.getVariable(someProperty)}" fail="true" message="'${someProperty}' must be specified"/>
+ <j:if test="${empty(somePropertyValue)}">
+ <i:ask question="What is the ${someProperty} to be used? (-D${someProperty}={value} to skip check)"
+ answer="${someProperty}"/>
+ </j:if>
+ <maven:param-check value="${context.getVariable(someProperty)}" fail="true" message="'${someProperty}' must be specified"/>
</j:forEach>
<!-- Create the result path -->
|
|
From: Siegfried G. <wd...@us...> - 2005-03-09 11:10:39
|
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'}">
|
|
From: Siegfried G. <wd...@us...> - 2005-03-09 11:37:04
|
wdsgoe 05/03/09 03:36:56
Modified: webtest plugin.jelly
Log:
Removed redundant XSL parameter
Revision Changes Path
1.14 +0 -2 maven-plugins/webtest/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 9 Mar 2005 11:10:27 -0000 1.13
+++ plugin.jelly 9 Mar 2005 11:36:56 -0000 1.14
@@ -223,8 +223,6 @@
<arg value="${webtest.docs.dest}/maven-webtest-report.html"/>
<arg value="-xsl"/>
<arg value="file:${plugin.dir}/plugin-resources/maven-webtest-report.xsl"/>
- <arg value="-xsl"/>
- <arg value="file:${plugin.dir}/plugin-resources/maven-webtest-report.xsl"/>
</java>
</goal>
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X