Upgraded HtmlUnit to 2.8.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8534 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/build.xml b/dev/build.xml
index 4d0f4ac..faa3bd9 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -86,13 +86,17 @@
<include name="tomcat/tomcat-jk2-2.1.jar" />
<include name="tomcat/tomcat-util-5.1.jar" />
<!-- htmlunit dependencies not already included: BEGIN -->
+ <include name="apache/http/httpclient-4.0.1.jar" />
+ <include name="apache/http/httpcore-4.0.1.jar" />
+ <include name="apache/http/httpmime-4.0.1.jar" />
+ <include name="apache/james/apache-mime4j-0.6.jar" />
<include name="apache/commons/commons-codec-1.3.jar" />
<include name="apache/commons/commons-httpclient-3.1.jar" />
<include name="apache/commons/commons-io-1.4.jar" />
<include name="apache/commons/commons-lang-2.4.jar" />
<include name="cssparser/cssparser-0.9.5.jar" />
- <include name="htmlunit/htmlunit-r5607/htmlunit-r5607.jar" />
- <include name="htmlunit/htmlunit-r5607/htmlunit-core-js-r5607.jar" />
+ <include name="htmlunit/htmlunit-r5940/htmlunit-r5940.jar" />
+ <include name="htmlunit/htmlunit-r5940/htmlunit-core-js-r5940.jar" />
<include name="nekohtml/nekohtml-1.9.13.jar" />
<include name="xalan/xalan-2.7.1.jar" />
<include name="xerces/xerces-2_9_1/serializer.jar" />
@@ -143,13 +147,17 @@
<zipfileset src="${gwt.tools.lib}/tomcat/tomcat-jk2-2.1.jar" />
<zipfileset src="${gwt.tools.lib}/tomcat/tomcat-util-5.1.jar" />
<!-- htmlunit dependencies not already included: BEGIN -->
+ <zipfileset src="${gwt.tools.lib}/apache/http/httpclient-4.0.1.jar" />
+ <zipfileset src="${gwt.tools.lib}/apache/http/httpcore-4.0.1.jar" />
+ <zipfileset src="${gwt.tools.lib}/apache/http/httpmime-4.0.1.jar" />
+ <zipfileset src="${gwt.tools.lib}/apache/james/apache-mime4j-0.6.jar" />
<zipfileset src="${gwt.tools.lib}/apache/commons/commons-codec-1.3.jar" />
<zipfileset src="${gwt.tools.lib}/apache/commons/commons-httpclient-3.1.jar" />
<zipfileset src="${gwt.tools.lib}/apache/commons/commons-io-1.4.jar" />
<zipfileset src="${gwt.tools.lib}/apache/commons/commons-lang-2.4.jar" />
<zipfileset src="${gwt.tools.lib}/cssparser/cssparser-0.9.5.jar" />
- <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-r5607/htmlunit-r5607.jar" />
- <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-r5607/htmlunit-core-js-r5607.jar" />
+ <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-r5940/htmlunit-r5940.jar" />
+ <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-r5940/htmlunit-core-js-r5940.jar" />
<zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.13.jar" />
<zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1.jar" />
<zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/serializer.jar" />
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath
index 9942d25..4502d00 100644
--- a/eclipse/dev/.classpath
+++ b/eclipse/dev/.classpath
@@ -37,8 +37,8 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/tomcat-jk2-2.1.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/tomcat-util-5.1.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/sun/swingworker/swing-worker-1.1.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-core-js-r5607.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-core-js-r5607-sources.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-r5607.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-r5607-sources.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-core-js-r5940.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-core-js-r5940-sources.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-r5940.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-r5940-sources.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.2.0/protobuf-java-rebased-2.2.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index c64b6d2..3918d05 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -9,6 +9,10 @@
<classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2.jar" sourcepath="/GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2-src.zip"/>
<classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/junit/junit-3.8.1.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-3.8.1-src.zip"/>
<classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/tomcat/servlet-api-2.5.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/http/httpclient-4.0.1.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/http/httpcore-4.0.1.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/http/httpmime-4.0.1.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/james/apache-mime4j-0.6.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-codec-1.3.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/commons-collections-3.1.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-httpclient-3.1.jar"/>
@@ -30,8 +34,8 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/easymock/easymockclassextension.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-3.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-r5607.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-r5607-sources.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-core-js-r5607.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5607/htmlunit-core-js-r5607-sources.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-r5940.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-r5940-sources.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-core-js-r5940.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5940/htmlunit-core-js-r5940-sources.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/redist/json/r2_20080312/json-1.5.jar" sourcepath="/GWT_TOOLS/redist/json/r2_20080312/json-src.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA.jar" sourcepath="/GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-6.1.11.jar" sourcepath="/GWT_TOOLS/lib/jetty/jetty-6.1.11-src.zip"/>
