From: Siegfried G. <wd...@us...> - 2003-08-10 13:59:34
|
wdsgoe 03/08/10 06:59:34 Modified: webtest project.xml project.properties plugin.properties plugin.jelly webtest/xdocs changes.xml Log: Updates for the new release Revision Changes Path 1.7 +6 -2 maven-plugins/webtest/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/project.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project.xml 18 Jul 2003 09:30:01 -0000 1.6 +++ project.xml 10 Aug 2003 13:59:33 -0000 1.7 @@ -4,7 +4,7 @@ <pomVersion>3</pomVersion> <id>maven-webtest-plugin</id> <name>Canoo WebTest Plug-in</name> - <currentVersion>0.7</currentVersion> + <currentVersion>0.8</currentVersion> <organization> <name>SourceForge</name> <url>http://sourceforge.net/projects/maven-plugins/</url> @@ -27,7 +27,7 @@ <distributionDirectory>/home/groups/m/ma/maven-plugins/htdocs/webtest/distributions/</distributionDirectory> <repository> - <connection>scm:cvs:pserver:ano...@cv...:/cvsroot/maven-plugins:maven-plugins/webtest</connection> + <connection>scm:cvs:pserver:wd...@cv...:/cvsroot/maven-plugins:maven-plugins/webtest</connection> <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/maven-plugins/maven-plugins/webtest/</url> </repository> @@ -175,6 +175,10 @@ <resource> <directory>${basedir}/src/plugin-resources</directory> <targetPath>plugin-resources</targetPath> + </resource> + <resource> + <directory>${basedir}/webtest</directory> + <targetPath>webtest</targetPath> </resource> <resource> <directory>${basedir}</directory> 1.3 +1 -1 maven-plugins/webtest/project.properties Index: project.properties =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/project.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- project.properties 18 Jul 2003 09:30:01 -0000 1.2 +++ project.properties 10 Aug 2003 13:59:33 -0000 1.3 @@ -3,4 +3,4 @@ # ------------------------------------------------------------------- maven.xdoc.date=left maven.xdoc.version=${pom.currentVersion} -maven.license.licenseFile=${basedir}/../../../LICENSE.txt +# maven.license.licenseFile=${basedir}/../../LICENSE.txt 1.4 +1 -1 maven-plugins/webtest/plugin.properties Index: plugin.properties =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/plugin.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plugin.properties 18 Jul 2003 09:30:01 -0000 1.3 +++ plugin.properties 10 Aug 2003 13:59:33 -0000 1.4 @@ -26,7 +26,7 @@ # -quiet ..... be extra quit # -debug ..... print debugging information -maven.webtest.ant.options= +maven.webtest.ant.options = # Settings for Canoo Webtest Configuration 1.7 +6 -6 maven-plugins/webtest/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/plugin.jelly,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- plugin.jelly 31 Jul 2003 18:34:52 -0000 1.6 +++ plugin.jelly 10 Aug 2003 13:59:33 -0000 1.7 @@ -99,13 +99,13 @@ them and start ANT accordingly --> - <j:set var="hasAntOptions" value="${maven.webtest.ant.options}X"/> + <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="${hasAntOptions != 'X'}"> - <echo>We have ANT options ...</echo> + <j:if test="${hasAntTarget != 'X'}"> + <echo>We have an Ant target!!!</echo> <java classname="org.apache.tools.ant.Main" fork="yes" dir="${basedir}" failonerror="false"> <classpath> <path refid="webtest.classpath"/> @@ -128,8 +128,8 @@ <arg value="${maven.webtest.target}"/> </java> </j:if> - <j:if test="${hasAntOptions == 'X'}"> - <!-- echo>We have no ANT options ...</echo --> + <j:if test="${hasAntTarget == 'X'}"> + <echo>We have NO Ant target!!</echo> <java classname="org.apache.tools.ant.Main" fork="yes" dir="${basedir}" failonerror="false"> <classpath> <path refid="webtest.classpath"/> @@ -146,9 +146,9 @@ <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:forEach> 1.5 +7 -0 maven-plugins/webtest/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/xdocs/changes.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- changes.xml 18 Jul 2003 09:30:01 -0000 1.4 +++ changes.xml 10 Aug 2003 13:59:34 -0000 1.5 @@ -7,6 +7,13 @@ <releases> + <release version="0.8" date="2003-08-01"> + <action dev="wdsgoe" type="fix"> + Fixed empty target problem with the ANT invocation + under UNIX/LINUX + </action> + </release> + <release version="0.7" date="2003-07-18"> <action dev="wdsgoe" type="update"> Got the plugin working for Maven B10. |