From: Siegfried G. <wd...@us...> - 2005-06-24 10:42:02
|
wdsgoe 05/06/24 03:41:53 Modified: webtest/xdocs changes.xml index.xml navigation.xml properties.xml webtest LICENSE.txt plugin.jelly project.xml Log: Preparing release 1.2 Revision Changes Path 1.18 +7 -3 maven-plugins/webtest/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/xdocs/changes.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- changes.xml 3 Jun 2005 17:54:05 -0000 1.17 +++ changes.xml 24 Jun 2005 10:41:53 -0000 1.18 @@ -6,13 +6,17 @@ <author email="sie...@it...">Siegfried Goeschl</author> </properties> <body> - <release version="1.2" date="IN CVS"></release> + <release version="1.2" date="2005-06-24"> + <action dev="wdsgoe" type="update">Prepared release 1.2</action> + <action dev="wdsgoe" type="update">Updated to WebTest 1.7, build number = R_881</action> + <action dev="wdsgoe" type="update">Most dependencies are declared in project.xml (again)</action> + </release> <release version="1.1" date="2005-06-03"></release> <release version="1.0" date="2005-03-18"> - <action dev="epugh" type="upgrade">Upgrade to build 752 of Webtest. Mostly consists of updating jar files.</action> + <action dev="epugh" type="update">Upgrade to build 752 of Webtest. Mostly consists of updating jar files.</action> <action dev="wdsgoe" type="fix" due-to="David Gerber">Fixed anchors in the XSLT</action> <action dev="wdsgoe" type="fix" due-to="Krystian Nowak">Hopefully fixed passing emtpy parameters to ANT on UNIX.</action> - <action dev="epugh" type="upgrade" due-to="Matt Raible">Upgrade to build 733 of Webtest. Mostly consists of updating jar files.</action> + <action dev="epugh" type="update" due-to="Matt Raible">Upgrade to build 733 of Webtest. Mostly consists of updating jar files.</action> <action dev="epugh" type="add">Add the ability to supply a list of extra systemproperties (maven.webtest.sysproperties) that are passed into the Ant task. Any empty system properties will cause a prompt first to supply the data.</action> <action dev="epugh" type="fix">Fix link to generated report when running maven site.</action> </release> 1.5 +1 -1 maven-plugins/webtest/xdocs/index.xml Index: index.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/xdocs/index.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- index.xml 28 Oct 2004 08:52:18 -0000 1.4 +++ index.xml 24 Jun 2005 10:41:53 -0000 1.5 @@ -11,7 +11,7 @@ <p> This plugin integrates the <a href="http://webtest.canoo.com">Canoo WebTest</a> - for MAVEN 1.0 just in case you have a webserver to test + for Maven 1.0.2 just in case you have a webserver to test </p> <subsection name="Canoo Webtest Software License"> 1.6 +0 -1 maven-plugins/webtest/xdocs/navigation.xml Index: navigation.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/xdocs/navigation.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- navigation.xml 18 Jul 2003 09:30:01 -0000 1.5 +++ navigation.xml 24 Jun 2005 10:41:53 -0000 1.6 @@ -13,7 +13,6 @@ <item name="Properties" href="/properties.html" /> <item name="SSL" href="/ssl.html" /> <item name="How To's" href="/how-to.html" /> - <item name="Download" href="http://sourceforge.net/projects/maven-plugins/" /> </menu> </body> </project> 1.6 +8 -0 maven-plugins/webtest/xdocs/properties.xml Index: properties.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/xdocs/properties.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- properties.xml 19 Nov 2004 13:39:07 -0000 1.5 +++ properties.xml 24 Jun 2005 10:41:53 -0000 1.6 @@ -158,6 +158,14 @@ Shows output of HTML parser, might have no effect now for NeckoHTML </td> </tr> + <tr> + <td>maven.webtest.config.autorefresh</td> + <td>Yes</td> + <td>false</td> + <td> + Specifies whether the client should automatically follow page refresh requests + </td> + </tr> </table> </section> </body> 1.2 +200 -55 maven-plugins/webtest/LICENSE.txt Index: LICENSE.txt =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/LICENSE.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE.txt 16 Dec 2002 11:34:03 -0000 1.1 +++ LICENSE.txt 24 Jun 2005 10:41:53 -0000 1.2 @@ -1,57 +1,202 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2001 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Wiki Maven Plugin" must not be used to endorse or promote products - * derived from this software without prior written permission. For - * written permission, please contact ap...@ap.... - * - * 5. Products derived from this software may not be called "Apache", - * "Apache Interactive Maven Plugin", nor may "Apache" appear in their name, without - * prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * ==================================================================== - */ + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. 1.15 +1 -1 maven-plugins/webtest/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/plugin.jelly,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- plugin.jelly 9 Mar 2005 11:36:56 -0000 1.14 +++ plugin.jelly 24 Jun 2005 10:41:53 -0000 1.15 @@ -67,9 +67,9 @@ 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.ant.options = ${maven.webtest.ant.options} maven.webtest.home = ${maven.webtest.home} + maven.webtest.sysproperties = ${maven.webtest.sysproperties} Canoo WebTest Configuration =============================================================================== 1.24 +110 -34 maven-plugins/webtest/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/webtest/project.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- project.xml 3 Jun 2005 17:54:04 -0000 1.23 +++ project.xml 24 Jun 2005 10:41:53 -0000 1.24 @@ -3,23 +3,19 @@ <project> <extend>${basedir}/../plugin-project.xml</extend> <!--pomVersion is in parent --> - <id>maven-webtest-plugin</id> <name>Canoo WebTest Plug-in</name> <!-- groupId is in parent --> - - <currentVersion>1.2-SNAPSHOT</currentVersion> + <currentVersion>1.2</currentVersion> <!-- organization is in parent --> - <inceptionYear>2002</inceptionYear> <!-- package, logo are in parent. no gumpRepositoryId --> - <description>Maven Plugin for Canoo WebTest</description> <shortDescription>Maven Plugin for Canoo WebTest</shortDescription> <!-- issue tracking url, siteAddress are in parent --> - <siteDirectory>/home/groups/m/ma/maven-plugins/htdocs/webtest/</siteDirectory> <distributionDirectory>/home/groups/m/ma/maven-plugins/htdocs/webtest/distributions/</distributionDirectory> + <repository> <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> @@ -35,7 +31,13 @@ <name>1.1</name> <tag>MAVEN_WEBTEST_PLUGIN_1_1</tag> </version> + <version> + <id>1.2</id> + <name>1.2</name> + <tag>MAVEN_WEBTEST_PLUGIN_1_2</tag> + </version> </versions> + <branches></branches> <!-- mailingLists are in parent --> @@ -84,57 +86,121 @@ </roles> </developer> </developers> + <contributors> + <contributor> + <name>David Gerber</name> + <id></id> + <email></email> + <roles> + <role></role> + </roles> + </contributor> + </contributors> <dependencies> <dependency> - <groupId>commons-jelly</groupId> - <artifactId>commons-jelly-tags-interaction</artifactId> - <version>1.0</version> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + <url>http://jakarata.apache.org/ant</url> </dependency> <dependency> <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.5.2</version> + <artifactId>ant-apache-bsf</artifactId> + <version>1.6.5</version> <url>http://jakarata.apache.org/ant</url> </dependency> <dependency> <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - <version>1.5.2</version> + <artifactId>ant-junit</artifactId> + <version>1.6.5</version> + <url>http://jakarata.apache.org/ant</url> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.6.5</version> + <url>http://jakarata.apache.org/ant</url> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.6.5</version> <url>http://jakarata.apache.org/ant</url> </dependency> <dependency> <groupId>asm</groupId> <artifactId>asm</artifactId> - <version>1.4.1</version> + <version>1.5.2</version> </dependency> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + <url>http://jakarta.apache.org/commons/beanutils/index.html</url> + </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>1.0</version> <url>http://jakarta.apache.org/commons/cli/index.html</url> </dependency> <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.4</version> - <url>http://www.dom4j.org</url> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + <url>http://jakarta.apache.org/commons/cli/index.html</url> </dependency> <dependency> - <groupId>groovy</groupId> - <artifactId>groovy</artifactId> - <version>1.0-beta-6</version> - <url>http://groovy.codehaus.org/</url> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + <url>http://jakarta.apache.org/commons/collections/index.html</url> + </dependency> + <dependency> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-tags-interaction</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0-rc2</version> + <url>http://jakarta.apache.org/commons/httpclient/index.html</url> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.0</version> + <url>http://jakarta.apache.org/commons/io/index.html</url> </dependency> <dependency> - <groupId>httpunit</groupId> - <artifactId>httpunit</artifactId> - <version>1.6</version> - <url/> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.0</version> + <url>http://jakarta.apache.org/commons/lang/index.html</url> </dependency> <dependency> - <groupId>jtidy</groupId> - <artifactId>jtidy</artifactId> - <version>4aug2000r7-dev</version> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + <url>http://jakarta.apache.org/commons/logging/index.html</url> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0-rc2</version> + <url>http://jakarta.apache.org/commons/logging/index.html</url> + </dependency> + <dependency> + <groupId>groovy</groupId> + <artifactId>groovy</artifactId> + <version>1.0-beta-9</version> + <url>http://groovy.codehaus.org/</url> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1-beta-6 </version> </dependency> <dependency> <groupId>junit</groupId> @@ -148,24 +214,34 @@ <version>1.2.8</version> </dependency> <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>0.9.4</version> + </dependency> + <dependency> <groupId>oro</groupId> <artifactId>oro</artifactId> <version>2.0.6</version> </dependency> <dependency> + <groupId>saxpath</groupId> + <artifactId>saxpath</artifactId> + <version>1.0-FCS</version> + </dependency> + <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> - <version>2.5.1</version> + <version>2.6.0</version> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.4.0</version> + <version>2.6.2</version> </dependency> <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.0.b2</version> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + <version>2.2.1</version> </dependency> </dependencies> <build> |