Re-introducing c5890 and c5891, which updated the htmlunit dependencies and
re-introduced the test.web.htmlunit target in test.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5917 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index ac1ea2e..4bb3d4f 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -19,9 +19,9 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/nekohtml/nekohtml-1.9.12.jar" />
<classpathentry kind="var" path="GWT_TOOLS/lib/selenium/selenium-java-client-driver.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/xalan/xalan-2.7.1.jar" />
- <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/serializer-2.7.1.jar" />
- <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xercesImpl-2.8.1.jar" />
- <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xml-apis-1.3.04.jar" />
+ <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/serializer.jar" />
+ <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/xercesImpl.jar" />
+ <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/xml-apis.jar" />
<classpathentry kind="var" path="GWT_TOOLS/lib/w3c/sac/sac-1.3.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/w3c/flute/flute-1.3.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-dev-windows"/>
diff --git a/user/build.xml b/user/build.xml
index 24a9bea..f285fcc 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -51,9 +51,9 @@
<pathelement location="${gwt.tools.lib}/htmlunit/htmlunit-core-js-2.5.jar" />
<pathelement location="${gwt.tools.lib}/nekohtml/nekohtml-1.9.12.jar" />
<pathelement location="${gwt.tools.lib}/xalan/xalan-2.7.1.jar" />
- <pathelement location="${gwt.tools.lib}/xerces/serializer-2.7.1.jar" />
- <pathelement location="${gwt.tools.lib}/xerces/xercesImpl-2.8.1.jar" />
- <pathelement location="${gwt.tools.lib}/xerces/xml-apis-1.3.04.jar" />
+ <pathelement location="${gwt.tools.lib}/xerces/xerces-2_9_1/serializer.jar" />
+ <pathelement location="${gwt.tools.lib}/xerces/xerces-2_9_1/xercesImpl.jar" />
+ <pathelement location="${gwt.tools.lib}/xerces/xerces-2_9_1/xml-apis.jar" />
<pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
</path>
<!-- Platform shouldn't matter here, just picking one -->
@@ -242,8 +242,7 @@
<antcall target="test.noserver"/>
<antcall target="test.web"/>
<antcall target="test.web.disableClassMetadata"/>
- <!-- TODO(amitmanjhi): uncomment it after fixing the xerces issue -->
- <!-- <antcall target="test.web.htmlunit"/> -->
+ <antcall target="test.web.htmlunit"/>
<antcall target="test.web.draft"/>
</parallel>
</limit>
