Revision: 673
http://svn.sourceforge.net/jwebunit/?rev=673&view=rev
Author: henryju
Date: 2007-03-04 04:51:12 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
Update documentation and reporting.
Modified Paths:
--------------
branches/1.x/jwebunit-commons-tests/pom.xml
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/NonHtmlContentTest.java
branches/1.x/jwebunit-htmlunit-plugin/pom.xml
branches/1.x/jwebunit-htmlunit-plugin/src/site/xdoc/index.xml
branches/1.x/pom.xml
branches/1.x/src/changes/changes.xml
branches/1.x/src/site/xdoc/building-maven.xml
branches/1.x/src/site/xdoc/index.xml
branches/1.x/src/site/xdoc/installation.xml
Modified: branches/1.x/jwebunit-commons-tests/pom.xml
===================================================================
--- branches/1.x/jwebunit-commons-tests/pom.xml 2007-03-03 18:53:28 UTC (rev
672)
+++ branches/1.x/jwebunit-commons-tests/pom.xml 2007-03-04 12:51:12 UTC (rev
673)
@@ -1,36 +1,38 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <parent>
- <artifactId>jwebunit</artifactId>
- <groupId>net.sourceforge.jwebunit</groupId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jwebunit-commons-tests</artifactId>
- <name>Commons Tests</name>
- <description>All test cases that each plugin should pass.</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.0.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <topDirectoryLocation>..</topDirectoryLocation>
- </properties>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <parent>
+ <artifactId>jwebunit</artifactId>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jwebunit-commons-tests</artifactId>
+ <name>Commons Tests</name>
+ <description>All test cases that each plugin should pass.</description>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ </properties>
</project>
\ No newline at end of file
Modified:
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/NonHtmlContentTest.java
===================================================================
---
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/NonHtmlContentTest.java
2007-03-03 18:53:28 UTC (rev 672)
+++
branches/1.x/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/NonHtmlContentTest.java
2007-03-04 12:51:12 UTC (rev 673)
@@ -4,12 +4,8 @@
******************************************************************************/
package net.sourceforge.jwebunit.tests;
-import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
import junit.framework.Test;
import junit.framework.TestSuite;
Modified: branches/1.x/jwebunit-htmlunit-plugin/pom.xml
===================================================================
--- branches/1.x/jwebunit-htmlunit-plugin/pom.xml 2007-03-03 18:53:28 UTC
(rev 672)
+++ branches/1.x/jwebunit-htmlunit-plugin/pom.xml 2007-03-04 12:51:12 UTC
(rev 673)
@@ -1,90 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <parent>
- <artifactId>jwebunit</artifactId>
- <groupId>net.sourceforge.jwebunit</groupId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jwebunit-htmlunit-plugin</artifactId>
- <name>HtmlUnit Plugin</name>
- <description>HtmlUnit plugin for JWebUnit.</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/*Test.java</include>
- <include>**/*Tests.java</include>
- </includes>
- <excludes>
- <exclude>**/*AbstractTest.java</exclude>
- <exclude>**/*AbstractTests.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>1.10</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-commons-tests</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>logkit</artifactId>
- <groupId>logkit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
- </dependencies>
- <properties>
- <topDirectoryLocation>..</topDirectoryLocation>
- </properties>
-</project>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <parent>
+ <artifactId>jwebunit</artifactId>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jwebunit-htmlunit-plugin</artifactId>
+ <name>HtmlUnit Plugin</name>
+ <description>HtmlUnit plugin for JWebUnit.</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/*Tests.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/*AbstractTest.java</exclude>
+ <exclude>**/*AbstractTests.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.10</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-commons-tests</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logkit</artifactId>
+ <groupId>logkit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ </properties>
+</project>
Modified: branches/1.x/jwebunit-htmlunit-plugin/src/site/xdoc/index.xml
===================================================================
--- branches/1.x/jwebunit-htmlunit-plugin/src/site/xdoc/index.xml
2007-03-03 18:53:28 UTC (rev 672)
+++ branches/1.x/jwebunit-htmlunit-plugin/src/site/xdoc/index.xml
2007-03-04 12:51:12 UTC (rev 673)
@@ -90,7 +90,7 @@
<dependency>
<groupId>net.sourceforge.jwebunit</groupId>
<artifactId>jwebunit-htmlunit-plugin</artifactId>
- <version>1.4-rc3</version>
+ <version>1.4-rc4</version>
</dependency>
...
</dependencies>
Modified: branches/1.x/pom.xml
===================================================================
--- branches/1.x/pom.xml 2007-03-03 18:53:28 UTC (rev 672)
+++ branches/1.x/pom.xml 2007-03-04 12:51:12 UTC (rev 673)
@@ -268,7 +268,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clover-plugin</artifactId>
<configuration>
- <generateHistorical>true</generateHistorical>
+ <generateHistorical>true</generateHistorical>
+ <licenseLocation>
+
${basedir}/${topDirectoryLocation}/src/test/clover/clover.license
+ </licenseLocation>
</configuration>
</plugin>
<plugin>
@@ -298,14 +301,24 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
<excludePackageNames>
net.sourceforge.jwebunit.javacc:net.sourceforge.jwebunit.tests
</excludePackageNames>
<links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
+
<link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
+
<link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
+
<link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+
<link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
+
<link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+
<link>http://jakarta.apache.org/commons/pool/apidocs/</link>
+ <link>http://www.junit.org/junit/javadoc/</link>
+ <link>http://logging.apache.org/log4j/docs/api/</link>
+ <link>http://jakarta.apache.org/regexp/apidocs/</link>
+ <link>http://htmlunit.sourceforge.net/apidocs/</link>
</links>
<groups>
<group>
@@ -333,6 +346,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+
<xrefLocation>${project.reporting.outputDirectory}/${topDirectoryLocation}/xref</xrefLocation>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: branches/1.x/src/changes/changes.xml
===================================================================
--- branches/1.x/src/changes/changes.xml 2007-03-03 18:53:28 UTC (rev
672)
+++ branches/1.x/src/changes/changes.xml 2007-03-04 12:51:12 UTC (rev
673)
@@ -7,7 +7,7 @@
</author>
</properties>
<body>
- <release version="1.4-RC4" date="UNKNOW">
+ <release version="1.4-RC4" date="march 04, 2007">
<action type="add" dev="Julien Henry" issue="993058" due-to="Chris
Eldredge">
Add new ResourceBundle related methods allowing formatting of
resources.
</action>
Modified: branches/1.x/src/site/xdoc/building-maven.xml
===================================================================
--- branches/1.x/src/site/xdoc/building-maven.xml 2007-03-03 18:53:28 UTC
(rev 672)
+++ branches/1.x/src/site/xdoc/building-maven.xml 2007-03-04 12:51:12 UTC
(rev 673)
@@ -23,15 +23,15 @@
First you need to download the latest Maven 2, which
currently is
<a href="http://maven.apache.org";>
- <tt>Maven-2.0.4</tt>
+ <tt>Maven-2.0.5</tt>
</a>
, make sure you download the binary archive
- (maven-2.0.4-bin.zip).
+ (maven-2.0.5-bin.zip).
</p>
<p>
Installing Maven should be easy: unzip the file to
any directory you like, let's say:
- <source>C:\maven-2.0.4</source>
+ <source>C:\maven-2.0.5</source>
</p>
<p>
Next you need to do 2 things:
@@ -39,7 +39,7 @@
<li>
add an environment variable MAVEN_HOME which
points to the install directory of Maven,
- i.e. C:\maven-2.0.4
+ i.e. C:\maven-2.0.5
</li>
<li>
add
@@ -126,10 +126,10 @@
You need at least jdk1.5 !!!
</p>
<source>
-$ svn co
-https://svn.codehaus.org/mojo/trunk/mojo/javacc-maven-plugin/
-$ cd javacc-maven-plugin $ patch -p0 < maven-javacc.patch patching file
-src/main/java/org/codehaus/mojo/javacc/JavaCCMojo.java
+$ svn co https://svn.codehaus.org/mojo/trunk/mojo/javacc-maven-plugin/
+$ cd javacc-maven-plugin
+$ patch -p0 < maven-javacc.patch
+patching file src/main/java/org/codehaus/mojo/javacc/JavaCCMojo.java
$ mvn clean install
</source>
<p>
@@ -142,9 +142,9 @@
manually the required SNAPSHOT.
</p>
<source>
-$ svn co
-https://svn.codehaus.org/mojo/trunk/mojo/exec-maven-plugin/
-$ cd exec-maven-plugin $ mvn clean install
+$ svn co https://svn.codehaus.org/mojo/trunk/mojo/exec-maven-plugin/
+$ cd exec-maven-plugin
+$ mvn clean install
</source>
<p>
Installation of maven-assembly-plugin-2.2-SNAPSHOT
Modified: branches/1.x/src/site/xdoc/index.xml
===================================================================
--- branches/1.x/src/site/xdoc/index.xml 2007-03-03 18:53:28 UTC (rev
672)
+++ branches/1.x/src/site/xdoc/index.xml 2007-03-04 12:51:12 UTC (rev
673)
@@ -11,7 +11,7 @@
<body>
<section name="Welcome">
<p>
- You are on the JWebUnit 1.x website. Current version is 1.4-RC3. This
is
+ You are on the JWebUnit 1.x website. Current version is 1.4-RC4. This
is
the "stable" version of JWebUnit. You can also consult <a
href="2.x/index.html">JWebUnit 2.x website</a>.
</p>
</section>
Modified: branches/1.x/src/site/xdoc/installation.xml
===================================================================
--- branches/1.x/src/site/xdoc/installation.xml 2007-03-03 18:53:28 UTC (rev
672)
+++ branches/1.x/src/site/xdoc/installation.xml 2007-03-04 12:51:12 UTC (rev
673)
@@ -22,7 +22,7 @@
<dependency>
<groupId>net.sourceforge.jwebunit</groupId>
<artifactId>jwebunit-htmlunit-plugin</artifactId>
- <version>1.4-rc3</version>
+ <version>1.4-rc4</version>
<scope>test</scope>
</dependency>
</dependencies>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
