Index: build.properties.default
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/build.properties.default,v
retrieving revision 1.9
diff -u -r1.9 build.properties.default
--- build.properties.default	21 Jul 2005 03:39:59 -0000	1.9
+++ build.properties.default	28 Jul 2005 17:33:35 -0000
@@ -220,6 +226,9 @@
 # The location of the Httpunit jar
 httpunit.jar = ${lib.repo}/${httpunit.project}/jars/${httpunit.artifact}-${httpunit.version}.jar
 
+# The location of the Hmlunit jar
+htmlunit.jar = ${lib.repo}/${htmlunit.project}/jars/${htmlunit.artifact}-${htmlunit.version}.jar
+
 # The location of the Cargo jar
 cargo.jar = ${lib.repo}/${cargo.project}/jars/${cargo.artifact}-${cargo.version}.jar
 
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/build.xml,v
retrieving revision 1.77
diff -u -r1.77 build.xml
--- build.xml	21 Jul 2005 03:39:59 -0000	1.77
+++ build.xml	26 Jul 2005 17:51:40 -0000
@@ -216,6 +216,8 @@
           prefix="${main.release.name}/lib"/>
       <zipfileset file="${httpunit.jar}"
           prefix="${main.release.name}/lib"/>
+	  <zipfileset file="${htmlunit.jar}"
+	      prefix="${main.release.name}/lib"/>
       <zipfileset file="${junit.jar}"
           prefix="${main.release.name}/lib"/>
       <zipfileset file="${nekohtml.jar}"
Index: dependencies.xml.default
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/dependencies.xml.default,v
retrieving revision 1.9
diff -u -r1.9 dependencies.xml.default
--- dependencies.xml.default	30 Apr 2005 17:23:43 -0000	1.9
+++ dependencies.xml.default	26 Jul 2005 17:23:09 -0000
@@ -25,6 +25,8 @@
       artifact="commons-logging" version="1.0.4"/>
   <httpunit project="httpunit"
       artifact="httpunit" version="1.6"/>
+  <htmlunit project="htmlunit"
+      artifact="htmlunit" version="1.6"/>
   <j2ee.13 project="jboss"
      artifact="jboss-j2ee" version="3.2.3"/>
   <j2ee.14 project="jboss"
Index: download.xml
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/download.xml,v
retrieving revision 1.7
diff -u -r1.7 download.xml
--- download.xml	26 Apr 2005 09:57:59 -0000	1.7
+++ download.xml	26 Jul 2005 19:07:00 -0000
@@ -116,6 +116,7 @@
     <download jar="commons.httpclient"/>
     <download jar="commons.logging"/>
     <download jar="httpunit"/>
+    <download jar="htmlunit"/>
     <download jar="jasper-compiler"/>
     <download jar="jasper-runtime"/>
     <download jar="jetty"/>
Index: framework/build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/framework/build.xml,v
retrieving revision 1.88
diff -u -r1.88 build.xml
--- framework/build.xml	23 May 2004 14:10:07 -0000	1.88
+++ framework/build.xml	26 Jul 2005 19:05:31 -0000
@@ -96,6 +96,7 @@
     <echo>  commons.httpclient.jar = [${commons.httpclient.jar}]</echo>
     <echo>  commons.logging.jar = [${commons.logging.jar}]</echo>
     <echo>  httpunit.jar = [${httpunit.jar}]</echo>
+    <echo>  htmlunit.jar = [${htmlunit.jar}]</echo>
     <echo>  j2ee.jar = [${j2ee.jar}]</echo>
     <echo>  servlet.jar = [${servlet.jar}]</echo>
     <echo>  jsp.jar = [${jsp.jar}]</echo>
@@ -115,6 +116,7 @@
       <pathelement location="${commons.logging.jar}"/>
       <pathelement location="${commons.httpclient.jar}"/>
       <pathelement location="${httpunit.jar}"/>
+      <pathelement location="${htmlunit.jar}"/>
       <pathelement location="${j2ee.jar}"/>
       <pathelement location="${servlet.jar}"/>
       <pathelement location="${jsp.jar}"/>
@@ -128,6 +130,7 @@
         <available file="${commons.httpclient.jar}"/>
         <available file="${commons.logging.jar}"/>
         <available file="${httpunit.jar}"/>
+        <available file="${htmlunit.jar}"/>
         <available file="${j2ee.jar}"/>
         <available file="${servlet.jar}"/>
         <available file="${jsp.jar}"/>
Index: framework/project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/framework/project.xml,v
retrieving revision 1.15
diff -u -r1.15 project.xml
--- framework/project.xml	22 May 2004 11:34:49 -0000	1.15
+++ framework/project.xml	26 Jul 2005 19:22:49 -0000
@@ -60,6 +60,11 @@
       <url>http://www.httpunit.org/</url>
     </dependency>
     <dependency>
+      <groupId>htmlunit</groupId>
+      <artifactId>htmlunit</artifactId>
+      <version>1.6</version>
+    </dependency>
+    <dependency>
       <groupId>j2ee</groupId>
       <artifactId>j2ee</artifactId>
       <version>${cactus.j2ee.version.full}</version>
Index: integration/ant/src/scripts/share/build-share.xml
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/integration/ant/src/scripts/share/build-share.xml,v
retrieving revision 1.25
diff -u -r1.25 build-share.xml
--- integration/ant/src/scripts/share/build-share.xml	21 Jul 2005 03:39:59 -0000	1.25
+++ integration/ant/src/scripts/share/build-share.xml	26 Jul 2005 19:12:32 -0000
@@ -69,7 +69,8 @@
         value="${cactus.lib.common.dir}/@junit.jar.name@"/>
     <property name="cactus.httpunit.jar" 
         value="${cactus.lib.common.dir}/@httpunit.jar.name@"/>
-
+    <property name="cactus.htmlunit.jar" 
+        value="${cactus.lib.common.dir}/@htmlunit.jar.name@"/>
     <property name="cactus.commons.httpclient.jar" 
         value="${cactus.lib.client.dir}/@commons.httpclient.jar.name@"/>
     <property name="cactus.nekohtml.jar" 
@@ -115,6 +116,7 @@
                 <pathelement location="${cactus.junit.jar}"/>
                 <pathelement location="${cactus.commons.httpclient.jar}"/>
                 <pathelement location="${cactus.httpunit.jar}"/>
+                <pathelement location="${cactus.htmlunit.jar}"/>
                 <path refid="cactus.classpath"/>
             </classpath>
         </javac>
@@ -234,6 +236,8 @@
           file="${cactus.junit.jar}"/>
         <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
           file="${cactus.httpunit.jar}"/>
+        <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
+          file="${cactus.htmlunit.jar}"/>
 
         <!-- Copy the JSP Redirector -->
         <copy todir="${cactus.target.dir}/${cactus.context}">
@@ -320,6 +324,7 @@
                 <pathelement location="${cactus.junit.jar}"/>
                 <pathelement location="${cactus.commons.httpclient.jar}"/>
                 <pathelement location="${cactus.httpunit.jar}"/>
+                <pathelement location="${cactus.htmlunit.jar}"/>
                 <pathelement location="${cactus.nekohtml.jar}"/>
                 <pathelement location="${cactus.xerces.jar}"/>
                 <pathelement location="${cactus.xmlapis.jar}"/>
@@ -373,6 +378,7 @@
                 <pathelement location="${cactus.junit.jar}"/>
                 <pathelement location="${cactus.commons.httpclient.jar}"/>
                 <pathelement location="${cactus.httpunit.jar}"/>
+                <pathelement location="${cactus.htmlunit.jar}"/>
                 <pathelement location="${cactus.nekohtml.jar}"/>
                 <pathelement location="${cactus.xerces.jar}"/>
                 <pathelement location="${cactus.xmlapis.jar}"/>
Index: integration/maven/plugin.jelly
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.50
diff -u -r1.50 plugin.jelly
--- integration/maven/plugin.jelly	31 May 2005 20:47:07 -0000	1.50
+++ integration/maven/plugin.jelly	28 Jul 2005 17:52:25 -0000
@@ -35,7 +35,7 @@
 
   <!--
      ========================================================================
-       Verify that the instlaled Maven has compatible versions of dependent 
+       Verify that the installed Maven has compatible versions of dependent 
        plugins.
      ========================================================================
   -->
@@ -99,6 +99,7 @@
       <ant:pathelement location="${plugin.getDependencyPath('commons-httpclient:commons-httpclient')}"/>
       <ant:pathelement location="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
       <ant:pathelement location="${plugin.getDependencyPath('httpunit:httpunit')}"/>
+      <ant:pathelement location="${plugin.getDependencyPath('htmlunit:htmlunit')}"/>
       <ant:pathelement location="${plugin.getDependencyPath('nekohtml:nekohtml')}"/>
       <ant:pathelement location="${plugin.getDependencyPath('xerces:xerces')}"/>
       <ant:pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
@@ -321,8 +322,9 @@
 
       <!-- Add all cactus related jars to the WEB-INF/lib dir. By default
       	   the CactifyWarTask only adds the pure Cactus jars but not
-      	   related jars such as HttpUnit jars -->
+      	   related jars such as HttpUnit/HtmlUnit jars -->
       <lib file="${plugin.getDependencyPath('httpunit:httpunit')}"/>
+      <lib file="${plugin.getDependencyPath('htmlunit:htmlunit')}"/>
 
       <!-- Add all user jars that have been marked to be included in the cactus
            test. For example, DBUnit would be a jar you would include in a 
Index: integration/maven/project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/integration/maven/project.xml,v
retrieving revision 1.28
diff -u -r1.28 project.xml
--- integration/maven/project.xml	12 Jul 2005 03:23:48 -0000	1.28
+++ integration/maven/project.xml	26 Jul 2005 19:24:40 -0000
@@ -64,14 +64,19 @@
       <version>0.5</version>
     </dependency>
 
-    <!-- Note: Dependencies below are needed by HttpUnit. Xerces is also
-    	 needed by the XML report used by the junitreport Ant task -->
+    <!-- Note: Dependencies below are needed by HttpUnit/HtmlUnit. Xerces is
+         also needed by the XML report used by the junitreport Ant task -->
     <dependency>
       <groupId>httpunit</groupId>
       <artifactId>httpunit</artifactId>
       <version>1.6</version>
     </dependency>
     <dependency>
+      <groupId>htmlunit</groupId>
+      <artifactId>htmlunit</artifactId>
+      <version>1.6</version>
+    </dependency>
+    <dependency>
       <groupId>nekohtml</groupId>
       <artifactId>nekohtml</artifactId>
       <version>0.9.1</version>
Index: samples/servlet/build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/samples/servlet/build.xml,v
retrieving revision 1.41
diff -u -r1.41 build.xml
--- samples/servlet/build.xml	21 Jul 2005 03:40:00 -0000	1.41
+++ samples/servlet/build.xml	26 Jul 2005 19:08:07 -0000
@@ -134,6 +134,7 @@
     <basename property="commons.logging.jar.name"
         file="${commons.logging.jar}"/>
     <basename property="httpunit.jar.name" file="${httpunit.jar}"/>
+    <basename property="htmlunit.jar.name" file="${htmlunit.jar}"/>
     <basename property="junit.jar.name" file="${junit.jar}"/>
     <basename property="nekohtml.jar.name" file="${nekohtml.jar}"/>
     <basename property="log4j.jar.name" file="${log4j.jar}"/>
@@ -151,6 +152,7 @@
       <filter token="commons.logging.jar.name"
           value="${commons.logging.jar.name}"/>
       <filter token="httpunit.jar.name" value="${httpunit.jar.name}"/>
+      <filter token="htmlunit.jar.name" value="${htmlunit.jar.name}"/>
       <filter token="junit.jar.name" value="${junit.jar.name}"/>
       <filter token="nekohtml.jar.name" value="${nekohtml.jar.name}"/>
       <filter token="log4j.jar.name" value="${log4j.jar.name}"/>
@@ -174,6 +176,7 @@
     <echo>  commons.httpclient.jar = [${commons.httpclient.jar}]</echo>
     <echo>  commons.logging.jar = [${commons.logging.jar}]</echo>
     <echo>  httpunit.jar = [${httpunit.jar}]</echo>
+    <echo>  htmlunit.jar = [${htmlunit.jar}]</echo>
     <echo>  servlet.jar = [${servlet.jar}]</echo>
     <echo>  junit.jar = [${junit.jar}]</echo>
     <echo>  log4j.jar = [${log4j.jar}]</echo>
@@ -196,6 +199,7 @@
         <available file="${commons.httpclient.jar}"/>
         <available file="${commons.logging.jar}"/>
         <available file="${httpunit.jar}"/>
+        <available file="${htmlunit.jar}"/>
         <available file="${servlet.jar}"/>
         <available file="${log4j.jar}"/>
         <or>
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/samples/servlet/src/scripts/share/build.xml,v
retrieving revision 1.33
diff -u -r1.33 build.xml
--- samples/servlet/src/scripts/share/build.xml	21 Jul 2005 23:24:39 -0000	1.33
+++ samples/servlet/src/scripts/share/build.xml	26 Jul 2005 19:09:20 -0000
@@ -112,6 +112,8 @@
       location="../../lib/@commons.logging.jar.name@"/>
   <property name="httpunit.jar"
       location="../../lib/@httpunit.jar.name@"/>
+  <property name="htmlunit.jar"
+      location="../../lib/@htmlunit.jar.name@"/>
   <property name="junit.jar"
       location="../../lib/@junit.jar.name@"/>
   <property name="nekohtml.jar"
@@ -187,6 +189,7 @@
       <classpath>
         <path refid="cactus.classpath"/>
         <pathelement location="${httpunit.jar}"/>
+        <pathelement location="${htmlunit.jar}"/>
         <pathelement location="${nekohtml.jar}"/>
         <pathelement location="${target.classes.java.dir}"/>
       </classpath>
@@ -283,6 +286,7 @@
         mergewebxml="${src.webapp.dir}/WEB-INF/cactus-web.xml">
       <classes dir="${target.classes.cactus.dir}"/>
       <lib file="${httpunit.jar}"/>
+      <lib file="${htmlunit.jar}"/>
       <lib file="${log4j.jar}"/>
       <!-- Provide a secured servlet redirector in addition to the
            default servlet redirector -->
@@ -357,6 +361,7 @@
           <path refid="cactus.classpath"/>
           <@clover.begin@pathelement location="${clover.jar}"/@clover.end@>
           <pathelement location="${httpunit.jar}"/>
+          <pathelement location="${htmlunit.jar}"/>
           <pathelement location="${nekohtml.jar}"/>
           <pathelement location="${target.classes.java.dir}"/>
           <pathelement location="${target.classes.cactus.dir}"/>